aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/freescale
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-04-22 19:24:19 -0400
committerDavid S. Miller <davem@davemloft.net>2013-04-22 19:24:19 -0400
commite5905c8352805373784b9df045de6f2864ab62ce (patch)
tree0fb0f586a7b247cc17db8896b51348a121ba9b4a /drivers/net/ethernet/freescale
parent3e3251b3f289528732edab386ddf73ac428359b7 (diff)
net: Fix some __vlan_hwaccel_put_tag() callers.
Several call sites were missed when the protocol argument was added to __vlan_hwaccel_put_tag() in commit 86a9bad3ab6b6f858fd4443b48738cabbb6d094c ("net: vlan: add protocol argument to packet tagging functions"). Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/freescale')
-rw-r--r--drivers/net/ethernet/freescale/gianfar.c2
1 files changed, 1 insertions, 1 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);