diff options
Diffstat (limited to 'drivers/net/ethernet/intel')
-rw-r--r-- | drivers/net/ethernet/intel/e1000/e1000_main.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/netdev.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/igb/igb_main.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/igbvf/netdev.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgb/ixgb_main.c | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c index 8239dafdd8e7..59ad007dd5aa 100644 --- a/drivers/net/ethernet/intel/e1000/e1000_main.c +++ b/drivers/net/ethernet/intel/e1000/e1000_main.c | |||
@@ -4003,7 +4003,7 @@ static void e1000_receive_skb(struct e1000_adapter *adapter, u8 status, | |||
4003 | if (status & E1000_RXD_STAT_VP) { | 4003 | if (status & E1000_RXD_STAT_VP) { |
4004 | u16 vid = le16_to_cpu(vlan) & E1000_RXD_SPC_VLAN_MASK; | 4004 | u16 vid = le16_to_cpu(vlan) & E1000_RXD_SPC_VLAN_MASK; |
4005 | 4005 | ||
4006 | __vlan_hwaccel_put_tag(skb, vid); | 4006 | __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vid); |
4007 | } | 4007 | } |
4008 | napi_gro_receive(&adapter->napi, skb); | 4008 | napi_gro_receive(&adapter->napi, skb); |
4009 | } | 4009 | } |
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 8c17f01a155f..da7f2fad5ba4 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c | |||
@@ -554,7 +554,7 @@ static void e1000_receive_skb(struct e1000_adapter *adapter, | |||
554 | skb->protocol = eth_type_trans(skb, netdev); | 554 | skb->protocol = eth_type_trans(skb, netdev); |
555 | 555 | ||
556 | if (staterr & E1000_RXD_STAT_VP) | 556 | if (staterr & E1000_RXD_STAT_VP) |
557 | __vlan_hwaccel_put_tag(skb, tag); | 557 | __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), tag); |
558 | 558 | ||
559 | napi_gro_receive(&adapter->napi, skb); | 559 | napi_gro_receive(&adapter->napi, skb); |
560 | } | 560 | } |
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index d13ea71c7c1f..9bf08b977daa 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c | |||
@@ -6683,7 +6683,7 @@ static void igb_process_skb_fields(struct igb_ring *rx_ring, | |||
6683 | else | 6683 | else |
6684 | vid = le16_to_cpu(rx_desc->wb.upper.vlan); | 6684 | vid = le16_to_cpu(rx_desc->wb.upper.vlan); |
6685 | 6685 | ||
6686 | __vlan_hwaccel_put_tag(skb, vid); | 6686 | __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vid); |
6687 | } | 6687 | } |
6688 | 6688 | ||
6689 | skb_record_rx_queue(skb, rx_ring->queue_index); | 6689 | skb_record_rx_queue(skb, rx_ring->queue_index); |
diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c index 3854fd698b85..93eb7ee06d3e 100644 --- a/drivers/net/ethernet/intel/igbvf/netdev.c +++ b/drivers/net/ethernet/intel/igbvf/netdev.c | |||
@@ -116,7 +116,7 @@ static void igbvf_receive_skb(struct igbvf_adapter *adapter, | |||
116 | else | 116 | else |
117 | vid = le16_to_cpu(vlan) & E1000_RXD_SPC_VLAN_MASK; | 117 | vid = le16_to_cpu(vlan) & E1000_RXD_SPC_VLAN_MASK; |
118 | if (test_bit(vid, adapter->active_vlans)) | 118 | if (test_bit(vid, adapter->active_vlans)) |
119 | __vlan_hwaccel_put_tag(skb, vid); | 119 | __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vid); |
120 | } | 120 | } |
121 | 121 | ||
122 | napi_gro_receive(&adapter->rx_ring->napi, skb); | 122 | napi_gro_receive(&adapter->rx_ring->napi, skb); |
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c index a32f274acd36..fce3e92f9d11 100644 --- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c +++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c | |||
@@ -2082,8 +2082,8 @@ ixgb_clean_rx_irq(struct ixgb_adapter *adapter, int *work_done, int work_to_do) | |||
2082 | 2082 | ||
2083 | skb->protocol = eth_type_trans(skb, netdev); | 2083 | skb->protocol = eth_type_trans(skb, netdev); |
2084 | if (status & IXGB_RX_DESC_STATUS_VP) | 2084 | if (status & IXGB_RX_DESC_STATUS_VP) |
2085 | __vlan_hwaccel_put_tag(skb, | 2085 | __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), |
2086 | le16_to_cpu(rx_desc->special)); | 2086 | le16_to_cpu(rx_desc->special)); |
2087 | 2087 | ||
2088 | netif_receive_skb(skb); | 2088 | netif_receive_skb(skb); |
2089 | 2089 | ||
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 3becffc77321..6225f880a3f4 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | |||
@@ -1491,7 +1491,7 @@ static void ixgbe_process_skb_fields(struct ixgbe_ring *rx_ring, | |||
1491 | if ((dev->features & NETIF_F_HW_VLAN_CTAG_RX) && | 1491 | if ((dev->features & NETIF_F_HW_VLAN_CTAG_RX) && |
1492 | ixgbe_test_staterr(rx_desc, IXGBE_RXD_STAT_VP)) { | 1492 | ixgbe_test_staterr(rx_desc, IXGBE_RXD_STAT_VP)) { |
1493 | u16 vid = le16_to_cpu(rx_desc->wb.upper.vlan); | 1493 | u16 vid = le16_to_cpu(rx_desc->wb.upper.vlan); |
1494 | __vlan_hwaccel_put_tag(skb, vid); | 1494 | __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vid); |
1495 | } | 1495 | } |
1496 | 1496 | ||
1497 | skb_record_rx_queue(skb, rx_ring->queue_index); | 1497 | skb_record_rx_queue(skb, rx_ring->queue_index); |
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c index 4bc1f84c9352..1f5166ad6bb5 100644 --- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | |||
@@ -291,7 +291,7 @@ static void ixgbevf_receive_skb(struct ixgbevf_q_vector *q_vector, | |||
291 | u16 tag = le16_to_cpu(rx_desc->wb.upper.vlan); | 291 | u16 tag = le16_to_cpu(rx_desc->wb.upper.vlan); |
292 | 292 | ||
293 | if (is_vlan && test_bit(tag & VLAN_VID_MASK, adapter->active_vlans)) | 293 | if (is_vlan && test_bit(tag & VLAN_VID_MASK, adapter->active_vlans)) |
294 | __vlan_hwaccel_put_tag(skb, tag); | 294 | __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), tag); |
295 | 295 | ||
296 | if (!(adapter->flags & IXGBE_FLAG_IN_NETPOLL)) | 296 | if (!(adapter->flags & IXGBE_FLAG_IN_NETPOLL)) |
297 | napi_gro_receive(&q_vector->napi, skb); | 297 | napi_gro_receive(&q_vector->napi, skb); |