diff options
| author | Jiri Pirko <jiri@resnulli.us> | 2014-11-19 14:04:58 +0100 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-04-27 16:48:33 -0400 |
| commit | d329729a26406301996d4ae63b3d7d489bd2f361 (patch) | |
| tree | b0fcc0fba67e0db5afd80bd8965c6fa5dc54a971 /drivers/net/bonding | |
| parent | c01a1cb6848c9b399cd4471cdd7d2393c46a56e8 (diff) | |
| download | linux-stable-d329729a26406301996d4ae63b3d7d489bd2f361.tar.gz linux-stable-d329729a26406301996d4ae63b3d7d489bd2f361.tar.bz2 linux-stable-d329729a26406301996d4ae63b3d7d489bd2f361.zip | |
vlan: rename __vlan_put_tag to vlan_insert_tag_set_proto
[ Upstream commit 62749e2cb3c4a7da3eaa5c01a7e787aebeff8536 ]
Name fits better. Plus there's going to be introduced
__vlan_insert_tag later on.
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'drivers/net/bonding')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 26764e7667d8..1cc06c0e3e92 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -2143,8 +2143,8 @@ static void bond_arp_send(struct net_device *slave_dev, int arp_op, netdev_dbg(slave_dev, "inner tag: proto %X vid %X\n", ntohs(outer_tag->vlan_proto), tags->vlan_id); - skb = __vlan_put_tag(skb, tags->vlan_proto, - tags->vlan_id); + skb = vlan_insert_tag_set_proto(skb, tags->vlan_proto, + tags->vlan_id); if (!skb) { net_err_ratelimited("failed to insert inner VLAN tag\n"); return; |