aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/neterion
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ethernet/neterion')
-rw-r--r--drivers/net/ethernet/neterion/s2io.c2
-rw-r--r--drivers/net/ethernet/neterion/vxge/vxge-main.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c
index ec82d59b03ed..51b00941302c 100644
--- a/drivers/net/ethernet/neterion/s2io.c
+++ b/drivers/net/ethernet/neterion/s2io.c
@@ -8555,7 +8555,7 @@ static void queue_rx_frame(struct sk_buff *skb, u16 vlan_tag)
8555 8555
8556 skb->protocol = eth_type_trans(skb, dev); 8556 skb->protocol = eth_type_trans(skb, dev);
8557 if (vlan_tag && sp->vlan_strip_flag) 8557 if (vlan_tag && sp->vlan_strip_flag)
8558 __vlan_hwaccel_put_tag(skb, vlan_tag); 8558 __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan_tag);
8559 if (sp->config.napi) 8559 if (sp->config.napi)
8560 netif_receive_skb(skb); 8560 netif_receive_skb(skb);
8561 else 8561 else
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c
index a9396142201c..cbfaed5f2f8d 100644
--- a/drivers/net/ethernet/neterion/vxge/vxge-main.c
+++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c
@@ -312,7 +312,7 @@ vxge_rx_complete(struct vxge_ring *ring, struct sk_buff *skb, u16 vlan,
312 312
313 if (ext_info->vlan && 313 if (ext_info->vlan &&
314 ring->vlan_tag_strip == VXGE_HW_VPATH_RPA_STRIP_VLAN_TAG_ENABLE) 314 ring->vlan_tag_strip == VXGE_HW_VPATH_RPA_STRIP_VLAN_TAG_ENABLE)
315 __vlan_hwaccel_put_tag(skb, ext_info->vlan); 315 __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), ext_info->vlan);
316 napi_gro_receive(ring->napi_p, skb); 316 napi_gro_receive(ring->napi_p, skb);
317 317
318 vxge_debug_entryexit(VXGE_TRACE, 318 vxge_debug_entryexit(VXGE_TRACE,