diff options
| author | Jiri Pirko <jiri@resnulli.us> | 2014-11-19 16:04:58 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-11-21 22:20:17 +0300 |
| commit | 62749e2cb3c4a7da3eaa5c01a7e787aebeff8536 (patch) | |
| tree | a464a51f430889a16db620946abf9d20874b3406 /net/bridge | |
| parent | b4bef1b57544b18899eb15569e3bafd8d2eeeff6 (diff) | |
| download | linux-62749e2cb3c4a7da3eaa5c01a7e787aebeff8536.tar.xz | |
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/bridge')
| -rw-r--r-- | net/bridge/br_vlan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c index 150048fb99b0..97b8ddf57363 100644 --- a/net/bridge/br_vlan.c +++ b/net/bridge/br_vlan.c @@ -199,8 +199,8 @@ bool br_allowed_ingress(struct net_bridge *br, struct net_port_vlans *v, if (skb->vlan_proto != proto) { /* Protocol-mismatch, empty out vlan_tci for new tag */ skb_push(skb, ETH_HLEN); - 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 (unlikely(!skb)) return false; |