| To: | jgarzik@xxxxxxxxx |
|---|---|
| Subject: | [patch 3/5 2.4] e1000 - Fix VLAN filter setup errors (while running on PPC) |
| From: | Ganesh Venkatesan <ganesh.venkatesan@xxxxxxxxx> |
| Date: | Fri, 17 Sep 2004 02:56:05 -0700 (PDT) |
| Cc: | ganesh.venkatesan@xxxxxxxxx, <netdev@xxxxxxxxxxx> |
| Replyto: | "Ganesh Venkatesan" <ganesh.venkatesan@xxxxxxxxx> |
| Sender: | netdev-bounce@xxxxxxxxxxx |
diff -up linux-2.4/drivers/net/e1000/e1000_main.c
linux-2.4/drivers/net/e1000.new/e1000_main.c
--- linux-2.4/drivers/net/e1000/e1000_main.c 2004-09-16 08:09:07.000000000
-0700
+++ linux-2.4/drivers/net/e1000.new/e1000_main.c 2004-09-16
08:09:08.000000000 -0700
@@ -2345,8 +2345,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);
}
@@ -2354,8 +2354,8 @@
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> |
|---|---|---|
| ||
| Previous by Date: | [patch 2/5 2.4] e1000 - Fix MODULE_PARM, module_param and module_param_array usage, Ganesh Venkatesan |
|---|---|
| Next by Date: | [patch 4/5 2.4] e1000 - Polarity reversal workaround for 10F/10H links, Ganesh Venkatesan |
| Previous by Thread: | [patch 2/5 2.4] e1000 - Fix MODULE_PARM, module_param and module_param_array usage, Ganesh Venkatesan |
| Next by Thread: | [patch 4/5 2.4] e1000 - Polarity reversal workaround for 10F/10H links, Ganesh Venkatesan |
| Indexes: | [Date] [Thread] [Top] [All Lists] |