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 /net/core/dev.c | |
| parent | c01a1cb6848c9b399cd4471cdd7d2393c46a56e8 (diff) | |
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 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 044a194d51a2..8a57104a17dd 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2664,8 +2664,8 @@ static struct sk_buff *validate_xmit_vlan(struct sk_buff *skb, { if (vlan_tx_tag_present(skb) && !vlan_hw_offload_capable(features, skb->vlan_proto)) { - skb = __vlan_put_tag(skb, skb->vlan_proto, - vlan_tx_tag_get(skb)); + skb = vlan_insert_tag_set_proto(skb, skb->vlan_proto, + vlan_tx_tag_get(skb)); if (skb) skb->vlan_tci = 0; } |