diff options
| author |   Jiri Pirko <jiri@resnulli.us> | 2014-11-19 14:04:58 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-11-21 14:20:17 -0500 |
| commit | 62749e2cb3c4a7da3eaa5c01a7e787aebeff8536 (patch) | |
| tree | a464a51f430889a16db620946abf9d20874b3406 /net/core/dev.c | |
| parent | vlan: kill vlan_put_tag helper (diff) | |
| download | linux-dev-62749e2cb3c4a7da3eaa5c01a7e787aebeff8536.tar.xz linux-dev-62749e2cb3c4a7da3eaa5c01a7e787aebeff8536.zip | |
vlan: rename __vlan_put_tag to vlan_insert_tag_set_proto
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>
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 1ab168e0fdf7..3611e60df407 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2645,8 +2645,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; } |