Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5905c83 authored by David S. Miller's avatar David S. Miller
Browse files

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
86a9bad3 ("net: vlan: add protocol
argument to packet tagging functions").

Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3e3251b3

drivers/net/ethernet/freescale/gianfar.c

+1 −1
Original line number Diff line number Diff line
@@ -2731,7 +2731,7 @@ static void gfar_process_frame(struct net_device *dev, struct sk_buff *skb, 
	 */

	if (dev->features & NETIF_F_HW_VLAN_CTAG_RX &&

	    fcb->flags & RXFCB_VLN)

		__vlan_hwaccel_put_tag(skb, fcb->vlctl);

		__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), fcb->vlctl);



	/* Send the packet up the stack */

	napi_gro_receive(napi, skb);

drivers/net/ethernet/ibm/ehea/ehea_main.c

+2 −1
Original line number Diff line number Diff line
@@ -725,7 +725,8 @@ static int ehea_proc_rwqes(struct net_device *dev, 
			processed_bytes += skb->len;



			if (cqe->status & EHEA_CQE_VLAN_TAG_XTRACT)

				__vlan_hwaccel_put_tag(skb, cqe->vlan_tag);

				__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),

						       cqe->vlan_tag);



			napi_gro_receive(&pr->napi, skb);

		} else {