aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGanesh Venkatesan <ganesh.venkatesan@intel.com>2005-01-08 02:21:58 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-01-08 02:21:58 -0500
commit02590d1fc188f3dab41a08c426ec405a2e2abdbd (patch)
tree2a1728c45251a3125d4f38e18011988c9ddb73d4 /drivers
parentb91cc1b20a4038f8426ba5b04cfef75c76dad879 (diff)
downloadhistory-02590d1fc188f3dab41a08c426ec405a2e2abdbd.tar.gz
[PATCH] ixgb: Fix VLAN filter setup errors (while running on PPC)
Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ixgb/ixgb_main.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index fb18298f3153fa..2acf007485485f 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -1892,9 +1892,8 @@ ixgb_clean_rx_irq(struct ixgb_adapter *adapter)
if (adapter->vlgrp
&& (rx_desc->status & IXGB_RX_DESC_STATUS_VP)) {
vlan_hwaccel_receive_skb(skb, adapter->vlgrp,
- le16_to_cpu(rx_desc->
- special &
- IXGB_RX_DESC_SPECIAL_VLAN_MASK));
+ le16_to_cpu(rx_desc->special) &
+ IXGB_RX_DESC_SPECIAL_VLAN_MASK);
} else {
netif_receive_skb(skb);
}
@@ -1902,9 +1901,8 @@ ixgb_clean_rx_irq(struct ixgb_adapter *adapter)
if (adapter->vlgrp
&& (rx_desc->status & IXGB_RX_DESC_STATUS_VP)) {
vlan_hwaccel_rx(skb, adapter->vlgrp,
- le16_to_cpu(rx_desc->
- special &
- IXGB_RX_DESC_SPECIAL_VLAN_MASK));
+ le16_to_cpu(rx_desc->special) &
+ IXGB_RX_DESC_SPECIAL_VLAN_MASK);
} else {
netif_rx(skb);
}