diff options
| author | Jiri Pirko <jiri@resnulli.us> | 2014-11-19 14:04:57 +0100 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-04-27 16:48:33 -0400 |
| commit | c01a1cb6848c9b399cd4471cdd7d2393c46a56e8 (patch) | |
| tree | cb7c7c3b5e03eb3252ca836d11023a22575d6173 /drivers/net/bonding/bond_main.c | |
| parent | ca7c7b9059e329fc3780d12deb5797e8ca03a73d (diff) | |
| download | linux-stable-c01a1cb6848c9b399cd4471cdd7d2393c46a56e8.tar.gz linux-stable-c01a1cb6848c9b399cd4471cdd7d2393c46a56e8.tar.bz2 linux-stable-c01a1cb6848c9b399cd4471cdd7d2393c46a56e8.zip | |
vlan: kill vlan_put_tag helper
[ Upstream commit b4bef1b57544b18899eb15569e3bafd8d2eeeff6 ]
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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'drivers/net/bonding/bond_main.c')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index df3db17ee7e6..26764e7667d8 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -2156,12 +2156,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: |