e1000 patch for linuxppc_2_4_devel

5 messages, 4 authors, 2003-05-21 · open the first message on its own page

e1000 patch for linuxppc_2_4_devel

From: Mark Rakes <hidden>
Date: 2003-05-17 00:04:54 

this patch fixes e1000 vlan hardware acceleration on ppc.

vlan tags weren't swapped.

thanks!
-Mark Rakes


diff -Nru a/drivers/net/e1000/e1000_main.c
b/drivers/net/e1000/e1000_main.c
--- a/drivers/net/e1000/e1000_main.c	Fri May 16 17:00:24 2003
+++ b/drivers/net/e1000/e1000_main.c	Fri May 16 17:00:24 2003
@@ -2062,7 +2062,8 @@
  		skb->protocol = eth_type_trans(skb, netdev);
  		if(adapter->vlgrp && (rx_desc->status & E1000_RXD_STAT_VP)) {
  			vlan_hwaccel_rx(skb, adapter->vlgrp,
-				le16_to_cpu(rx_desc->special & E1000_RXD_SPC_VLAN_MASK));
+				le16_to_cpu(rx_desc->special &
+					    E1000_RXD_SPC_VLAN_MASK));
  		} else {
  			netif_rx(skb);
  		}


** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/

Re: e1000 patch for linuxppc_2_4_devel

From: Daniel Jacobowitz <hidden>
Date: 2003-05-18 04:39:01 

On Fri, May 16, 2003 at 05:04:54PM -0700, Mark Rakes wrote:
quoted hunk
this patch fixes e1000 vlan hardware acceleration on ppc.

vlan tags weren't swapped.

thanks!
-Mark Rakes


diff -Nru a/drivers/net/e1000/e1000_main.c
b/drivers/net/e1000/e1000_main.c
--- a/drivers/net/e1000/e1000_main.c	Fri May 16 17:00:24 2003
+++ b/drivers/net/e1000/e1000_main.c	Fri May 16 17:00:24 2003
@@ -2062,7 +2062,8 @@
 		skb->protocol = eth_type_trans(skb, netdev);
 		if(adapter->vlgrp && (rx_desc->status & E1000_RXD_STAT_VP)) {
 			vlan_hwaccel_rx(skb, adapter->vlgrp,
-				le16_to_cpu(rx_desc->special &
E1000_RXD_SPC_VLAN_MASK));
+				le16_to_cpu(rx_desc->special &
+					    E1000_RXD_SPC_VLAN_MASK));
 		} else {
 			netif_rx(skb);
 		}
That patch doesn't do anything but move a line break.  Is that really
what you meant to do?

--
Daniel Jacobowitz
MontaVista Software                         Debian GNU/Linux Developer

** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/

Re: e1000 patch for linuxppc_2_4_devel

From: Mark Rakes <hidden>
Date: 2003-05-19 16:25:37 

whoops. the le16_to_cpu() isn't there at all in the code.
trying to learn bk and keep the width under 80 was a bad combo.

real patch should look like:

diff -Nru a/drivers/net/e1000/e1000_main.c
b/drivers/net/e1000/e1000_main.c
--- a/drivers/net/e1000/e1000_main.c	Mon May 19 09:24:11 2003
+++ b/drivers/net/e1000/e1000_main.c	Mon May 19 09:24:11 2003
@@ -2062,7 +2062,8 @@
  		skb->protocol = eth_type_trans(skb, netdev);
  		if(adapter->vlgrp && (rx_desc->status & E1000_RXD_STAT_VP)) {
  			vlan_hwaccel_rx(skb, adapter->vlgrp,
-				(rx_desc->special & E1000_RXD_SPC_VLAN_MASK));
+				le16_to_cpu(rx_desc->special &
+					    E1000_RXD_SPC_VLAN_MASK));
  		} else {
  			netif_rx(skb);
  		}




On Saturday, May 17, 2003, at 09:39  PM, Daniel Jacobowitz wrote:

On Fri, May 16, 2003 at 05:04:54PM -0700, Mark Rakes wrote:
quoted
this patch fixes e1000 vlan hardware acceleration on ppc.

vlan tags weren't swapped.

thanks!
-Mark Rakes


diff -Nru a/drivers/net/e1000/e1000_main.c
b/drivers/net/e1000/e1000_main.c
--- a/drivers/net/e1000/e1000_main.c	Fri May 16 17:00:24 2003
+++ b/drivers/net/e1000/e1000_main.c	Fri May 16 17:00:24 2003
@@ -2062,7 +2062,8 @@
 		skb->protocol = eth_type_trans(skb, netdev);
 		if(adapter->vlgrp && (rx_desc->status & E1000_RXD_STAT_VP)) {
 			vlan_hwaccel_rx(skb, adapter->vlgrp,
-				le16_to_cpu(rx_desc->special &
E1000_RXD_SPC_VLAN_MASK));
+				le16_to_cpu(rx_desc->special &
+					    E1000_RXD_SPC_VLAN_MASK));
 		} else {
 			netif_rx(skb);
 		}
That patch doesn't do anything but move a line break.  Is that really
what you meant to do?

--
Daniel Jacobowitz
MontaVista Software                         Debian GNU/Linux Developer

** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/

Re: e1000 patch for linuxppc_2_4_devel

From: Mark Rakes <hidden>
Date: 2003-05-20 19:07:10 

OK.  final version of the patch. this one even works for large tag
values.

Sorry for all the confusion.
-mark

diff -Nru a/drivers/net/e1000/e1000_main.c
b/drivers/net/e1000/e1000_main.c
--- a/drivers/net/e1000/e1000_main.c	Fri May 16 17:00:24 2003
+++ b/drivers/net/e1000/e1000_main.c	Fri May 16 17:00:24 2003
@@ -2062,7 +2062,8 @@
  		skb->protocol = eth_type_trans(skb, netdev);
  		if(adapter->vlgrp && (rx_desc->status & E1000_RXD_STAT_VP)) {
  			vlan_hwaccel_rx(skb, adapter->vlgrp,
-				le16_to_cpu(rx_desc->special & E1000_RXD_SPC_VLAN_MASK));
+				(le16_to_cpu(rx_desc->special) &
+					    E1000_RXD_SPC_VLAN_MASK));
  		} else {
  			netif_rx(skb);
  		}



On Friday, May 16, 2003, at 05:04  PM, Mark Rakes wrote:
quoted hunk
this patch fixes e1000 vlan hardware acceleration on ppc.

vlan tags weren't swapped.

thanks!
-Mark Rakes


diff -Nru a/drivers/net/e1000/e1000_main.c
b/drivers/net/e1000/e1000_main.c
--- a/drivers/net/e1000/e1000_main.c	Fri May 16 17:00:24 2003
+++ b/drivers/net/e1000/e1000_main.c	Fri May 16 17:00:24 2003
@@ -2062,7 +2062,8 @@
 		skb->protocol = eth_type_trans(skb, netdev);
 		if(adapter->vlgrp && (rx_desc->status & E1000_RXD_STAT_VP)) {
 			vlan_hwaccel_rx(skb, adapter->vlgrp,
-				le16_to_cpu(rx_desc->special & E1000_RXD_SPC_VLAN_MASK));
+				le16_to_cpu(rx_desc->special &
+					    E1000_RXD_SPC_VLAN_MASK));
 		} else {
 			netif_rx(skb);
 		}

** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/

Re: e1000 patch for linuxppc_2_4_devel

From: Paul Mackerras <hidden>
Date: 2003-05-21 22:10:00 

Mark Rakes writes:
OK.  final version of the patch. this one even works for large tag
values.
I suggest you send the patch to the e1000 driver maintainer.  It can
go in linuxppc_2_4_devel but that is a dead end for it really.

Paul.

** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help