aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/ethernet/freescale/gianfar.c2
-rw-r--r--drivers/net/ethernet/ibm/ehea/ehea_main.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
index 51555445ce2f..2375a01715a0 100644
--- a/drivers/net/ethernet/freescale/gianfar.c
+++ b/drivers/net/ethernet/freescale/gianfar.c
@@ -2731,7 +2731,7 @@ static void gfar_process_frame(struct net_device *dev, struct sk_buff *skb,
2731 */ 2731 */
2732 if (dev->features & NETIF_F_HW_VLAN_CTAG_RX && 2732 if (dev->features & NETIF_F_HW_VLAN_CTAG_RX &&
2733 fcb->flags & RXFCB_VLN) 2733 fcb->flags & RXFCB_VLN)
2734 __vlan_hwaccel_put_tag(skb, fcb->vlctl); 2734 __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), fcb->vlctl);
2735 2735
2736 /* Send the packet up the stack */ 2736 /* Send the packet up the stack */
2737 napi_gro_receive(napi, skb); 2737 napi_gro_receive(napi, skb);
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c
index d1812aacbc7b..1901ceb47dbf 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_main.c
+++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c
@@ -725,7 +725,8 @@ static int ehea_proc_rwqes(struct net_device *dev,
725 processed_bytes += skb->len; 725 processed_bytes += skb->len;
726 726
727 if (cqe->status & EHEA_CQE_VLAN_TAG_XTRACT) 727 if (cqe->status & EHEA_CQE_VLAN_TAG_XTRACT)
728 __vlan_hwaccel_put_tag(skb, cqe->vlan_tag); 728 __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),
729 cqe->vlan_tag);
729 730
730 napi_gro_receive(&pr->napi, skb); 731 napi_gro_receive(&pr->napi, skb);
731 } else { 732 } else {