e1000 patch for linuxppc_2_4

linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed

* e1000 patch for linuxppc_2_4_devel
@ 2003-05-17  0:04 Mark Rakes
  2003-05-18  4:39 ` Daniel Jacobowitz
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Mark Rakes @ 2003-05-17  0:04 UTC (permalink / raw)
  To: linuxppc-dev


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/

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: e1000 patch for linuxppc_2_4_devel
  2003-05-17  0:04 e1000 patch for linuxppc_2_4_devel Mark Rakes
@ 2003-05-18  4:39 ` Daniel Jacobowitz
  2003-05-19 16:25   ` Mark Rakes
  2003-05-19 15:21 ` linas
  2003-05-20 19:07 ` Mark Rakes
  2 siblings, 1 reply; 6+ messages in thread
From: Daniel Jacobowitz @ 2003-05-18  4:39 UTC (permalink / raw)
  To: Mark Rakes; +Cc: linuxppc-dev


On Fri, May 16, 2003 at 05:04:54PM -0700, Mark Rakes wrote:
>
> 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/

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: e1000 patch for linuxppc_2_4_devel
  2003-05-18  4:39 ` Daniel Jacobowitz
@ 2003-05-19 16:25   ` Mark Rakes
  0 siblings, 0 replies; 6+ messages in thread
From: Mark Rakes @ 2003-05-19 16:25 UTC (permalink / raw)
  To: Daniel Jacobowitz; +Cc: linuxppc-dev


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:
>>
>> 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/

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: e1000 patch for linuxppc_2_4_devel
  2003-05-17  0:04 e1000 patch for linuxppc_2_4_devel Mark Rakes
  2003-05-18  4:39 ` Daniel Jacobowitz
@ 2003-05-19 15:21 ` linas
  2003-05-20 19:07 ` Mark Rakes
  2 siblings, 0 replies; 6+ messages in thread
From: linas @ 2003-05-19 15:21 UTC (permalink / raw)
  To: Mark Rakes; +Cc: linuxppc-dev


Hi,


On Fri, May 16, 2003 at 05:04:54PM -0700, Mark Rakes wrote:
>
> this patch fixes e1000 vlan hardware acceleration on ppc.
>
> vlan tags weren't swapped.

Maybe I hav e junky fonts in my mailreader, but, no matter how
hard I squint, the only thing I can see in this patch is a
change in indentation.  Whazzup?

--linas

> 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/

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: e1000 patch for linuxppc_2_4_devel
  2003-05-17  0:04 e1000 patch for linuxppc_2_4_devel Mark Rakes
  2003-05-18  4:39 ` Daniel Jacobowitz
  2003-05-19 15:21 ` linas
@ 2003-05-20 19:07 ` Mark Rakes
  2003-05-21 22:10   ` Paul Mackerras
  2 siblings, 1 reply; 6+ messages in thread
From: Mark Rakes @ 2003-05-20 19:07 UTC (permalink / raw)
  To: linuxppc-dev


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:

> 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/

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: e1000 patch for linuxppc_2_4_devel
  2003-05-20 19:07 ` Mark Rakes
@ 2003-05-21 22:10   ` Paul Mackerras
  0 siblings, 0 replies; 6+ messages in thread
From: Paul Mackerras @ 2003-05-21 22:10 UTC (permalink / raw)
  To: Mark Rakes; +Cc: linuxppc-dev

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/

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2003-05-21 22:10 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2003-05-17  0:04 e1000 patch for linuxppc_2_4_devel Mark Rakes
2003-05-18  4:39 ` Daniel Jacobowitz
2003-05-19 16:25   ` Mark Rakes
2003-05-19 15:21 ` linas
2003-05-20 19:07 ` Mark Rakes
2003-05-21 22:10   ` Paul Mackerras

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).