diff options
Diffstat (limited to 'drivers/net/ixgb')
| -rw-r--r-- | drivers/net/ixgb/ixgb_main.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c index cb8daddafa29..41f3adf5f375 100644 --- 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) | |||
| 2045 | #ifdef CONFIG_IXGB_NAPI | 2045 | #ifdef CONFIG_IXGB_NAPI |
| 2046 | if(adapter->vlgrp && (status & IXGB_RX_DESC_STATUS_VP)) { | 2046 | if(adapter->vlgrp && (status & IXGB_RX_DESC_STATUS_VP)) { |
| 2047 | vlan_hwaccel_receive_skb(skb, adapter->vlgrp, | 2047 | vlan_hwaccel_receive_skb(skb, adapter->vlgrp, |
| 2048 | le16_to_cpu(rx_desc->special) & | 2048 | le16_to_cpu(rx_desc->special)); |
| 2049 | IXGB_RX_DESC_SPECIAL_VLAN_MASK); | ||
| 2050 | } else { | 2049 | } else { |
| 2051 | netif_receive_skb(skb); | 2050 | netif_receive_skb(skb); |
| 2052 | } | 2051 | } |
| 2053 | #else /* CONFIG_IXGB_NAPI */ | 2052 | #else /* CONFIG_IXGB_NAPI */ |
| 2054 | if(adapter->vlgrp && (status & IXGB_RX_DESC_STATUS_VP)) { | 2053 | if(adapter->vlgrp && (status & IXGB_RX_DESC_STATUS_VP)) { |
| 2055 | vlan_hwaccel_rx(skb, adapter->vlgrp, | 2054 | vlan_hwaccel_rx(skb, adapter->vlgrp, |
| 2056 | le16_to_cpu(rx_desc->special) & | 2055 | le16_to_cpu(rx_desc->special)); |
| 2057 | IXGB_RX_DESC_SPECIAL_VLAN_MASK); | ||
| 2058 | } else { | 2056 | } else { |
| 2059 | netif_rx(skb); | 2057 | netif_rx(skb); |
| 2060 | } | 2058 | } |