net: rename vlan_tx_* helpers since "tx" is misleading there

[mirror_ubuntu-artful-kernel.git] / net / bridge / netfilter / ebt_vlan.c

diff --git a/net/bridge/netfilter/ebt_vlan.c b/net/bridge/netfilter/ebt_vlan.c
index 8d3f8c7651f0dcec64bc7cac84a7f9c3d8953352..6185688881285f356f98c0ab328fd91da45b1239 100644 (file)
--- a/net/bridge/netfilter/ebt_vlan.c
+++ b/net/bridge/netfilter/ebt_vlan.c
@@ -45,8 +45,8 @@ ebt_vlan_mt(const struct sk_buff *skb, struct xt_action_param *par)
        /* VLAN encapsulated Type/Length field, given from orig frame */
        __be16 encap;
 
-       if (vlan_tx_tag_present(skb)) {
-               TCI = vlan_tx_tag_get(skb);
+       if (skb_vlan_tag_present(skb)) {
+               TCI = skb_vlan_tag_get(skb);
                encap = skb->protocol;
        } else {
                const struct vlan_hdr *fp;