xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vlan: rename __vlan_put_tag to vlan_insert_tag_set_proto

Browse Source 
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>
This commit is contained in:
Jiri Pirko
2014-11-19 14:04:58 +01:00
committed by David S. Miller
parent b4bef1b575
commit 62749e2cb3
11 changed files with 36 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/openvswitch/vport-gre.c
View File

@@ -176,9 +176,9 @@ static int gre_tnl_send(struct vport *vport, struct sk_buff *skb)
}
if (vlan_tx_tag_present(skb)) {
if (unlikely(!__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) {
err = -ENOMEM;
goto err_free_rt;
}