vlan: kill vlan_put_tag helper

Since both tx and rx paths work with skb->vlan_tci, there's no need for
this function anymore. Switch users directly to __vlan_hwaccel_put_tag.

Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 6 insertions, 19 deletions

diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index e1f1a006af85..bb9e9fc45e1b 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -475,12 +475,8 @@ static void rlb_update_client(struct rlb_client_info *client_info)
                 skb->dev = client_info->slave->dev;
 
                 if (client_info->vlan_id) {
-                        skb = vlan_put_tag(skb, htons(ETH_P_8021Q), client_info->vlan_id);
-                        if (!skb) {
-                                netdev_err(client_info->slave->bond->dev,
-                                           "failed to insert VLAN tag\n");
-                                continue;
-                        }
+                        __vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q),
+                                               client_info->vlan_id);
                 }
 
                 arp_xmit(skb);
@@ -951,13 +947,8 @@ static void alb_send_lp_vid(struct slave *slave, u8 mac_addr[],
         skb->priority = TC_PRIO_CONTROL;
         skb->dev = slave->dev;
 
-        if (vid) {
-                skb = vlan_put_tag(skb, vlan_proto, vid);
-                if (!skb) {
-                        netdev_err(slave->bond->dev, "failed to insert VLAN tag\n");
-                        return;
-                }
-        }
+        if (vid)
+                __vlan_hwaccel_put_tag(skb, vlan_proto, vid);
 
         dev_queue_xmit(skb);
 }
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 8575fee8b359..e26c68232032 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -2159,12 +2159,8 @@ static void bond_arp_send(struct net_device *slave_dev, int arp_op,
         if (outer_tag->vlan_id) {
                 netdev_dbg(slave_dev, "outer tag: proto %X vid %X\n",
                            ntohs(outer_tag->vlan_proto), outer_tag->vlan_id);
-                skb = vlan_put_tag(skb, outer_tag->vlan_proto,
-                                   outer_tag->vlan_id);
-                if (!skb) {
-                        net_err_ratelimited("failed to insert outer VLAN tag\n");
-                        return;
-                }
+                __vlan_hwaccel_put_tag(skb, outer_tag->vlan_proto,
+                                       outer_tag->vlan_id);
         }
 
 xmit: