diff options
| author | Jiri Pirko <jiri@resnulli.us> | 2014-11-19 16:04:57 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-11-21 22:20:17 +0300 |
| commit | b4bef1b57544b18899eb15569e3bafd8d2eeeff6 (patch) | |
| tree | 5f78030a09edac7df1e26c109d6aa2ef03927d5b /include/linux | |
| parent | b960a0ac6939ef4962c5abbf33e80d1382b45fc1 (diff) | |
| download | linux-b4bef1b57544b18899eb15569e3bafd8d2eeeff6.tar.xz | |
vlan: kill vlan_put_tag helper
Since both tx and rx paths work with skb->vlan_tci, there's no need for
this function anymore. Switch users directly to __vlan_hwaccel_put_tag.
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/if_vlan.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h index 1b5dbc2711f9..75b70a5e4a6d 100644 --- a/include/linux/if_vlan.h +++ b/include/linux/if_vlan.h @@ -355,25 +355,6 @@ static inline void __vlan_hwaccel_put_tag(struct sk_buff *skb, } /** - * vlan_put_tag - inserts VLAN tag according to device features - * @skb: skbuff to tag - * @vlan_tci: VLAN TCI to insert - * - * Assumes skb->dev is the target that will xmit this frame. - * Returns a VLAN tagged skb. - */ -static inline struct sk_buff *vlan_put_tag(struct sk_buff *skb, - __be16 vlan_proto, u16 vlan_tci) -{ - if (vlan_hw_offload_capable(skb->dev->features, vlan_proto)) { - __vlan_hwaccel_put_tag(skb, vlan_proto, vlan_tci); - return skb; - } else { - return __vlan_put_tag(skb, vlan_proto, vlan_tci); - } -} - -/** * __vlan_get_tag - get the VLAN ID that is part of the payload * @skb: skbuff to query * @vlan_tci: buffer to store vlaue |