netdev
[Top] [All Lists]

[patch 5/8 2.5] e1000 - Fix VLAN filter setup errors (while running on P

To: jgarzik@xxxxxxxxx
Subject: [patch 5/8 2.5] e1000 - Fix VLAN filter setup errors (while running on PPC)
From: Ganesh Venkatesan <ganesh.venkatesan@xxxxxxxxx>
Date: Fri, 17 Sep 2004 02:57:50 -0700 (PDT)
Cc: ganesh.venkatesan@xxxxxxxxx, <netdev@xxxxxxxxxxx>
Replyto: "Ganesh Venkatesan" <ganesh.venkatesan@xxxxxxxxx>
Sender: netdev-bounce@xxxxxxxxxxx
diff -up linux-2.5/drivers/net/e1000/e1000_main.c 
linux-2.5/drivers/net/e1000.new/e1000_main.c
--- linux-2.5/drivers/net/e1000/e1000_main.c    2004-09-09 11:17:11.000000000 
-0700
+++ linux-2.5/drivers/net/e1000.new/e1000_main.c        2004-09-09 
11:17:12.000000000 -0700
@@ -2322,8 +2322,8 @@ e1000_clean_rx_irq(struct e1000_adapter 
                if(unlikely(adapter->vlgrp &&
                            (rx_desc->status & E1000_RXD_STAT_VP))) {
                        vlan_hwaccel_receive_skb(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_receive_skb(skb);
                }
@@ -2331,8 +2331,8 @@ e1000_clean_rx_irq(struct e1000_adapter 
                if(unlikely(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);
                }



<Prev in Thread] Current Thread [Next in Thread>
  • [patch 5/8 2.5] e1000 - Fix VLAN filter setup errors (while running on PPC), Ganesh Venkatesan <=