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>

diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
index 51555445ce2fc95b82e5ec380acacdc9ce5aa638..2375a01715a0e93fa8f78c89dfcc90a88325585e 100644 (file)
--- 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,
         */
        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);

diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c
index d1812aacbc7b71f0af28b18468b01bfd8b90f4df..1901ceb47dbf7b6fb8b05ff5330384f352599e78 100644 (file)
--- 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,
                        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 {