netdrv: don't truncate VLAN TCI with VLAN stripping

[deliverable/linux.git] / drivers / net / ixgb / ixgb_main.c

diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index cb8daddafa29376826affbe19d102c6bd73154fd..41f3adf5f375e805cf2a23cab8ef7629b9d808da 100644 (file)
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -2045,16 +2045,14 @@ ixgb_clean_rx_irq(struct ixgb_adapter *adapter)
 #ifdef CONFIG_IXGB_NAPI
                if(adapter->vlgrp && (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));
                } else {
                        netif_receive_skb(skb);
                }
 #else /* CONFIG_IXGB_NAPI */
                if(adapter->vlgrp && (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));
                } else {
                        netif_rx(skb);
                }