diff options
| author | Jiri Pirko <jiri@resnulli.us> | 2014-11-19 14:04:57 +0100 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-04-27 16:48:33 -0400 |
| commit | c01a1cb6848c9b399cd4471cdd7d2393c46a56e8 (patch) | |
| tree | cb7c7c3b5e03eb3252ca836d11023a22575d6173 /include | |
| parent | ca7c7b9059e329fc3780d12deb5797e8ca03a73d (diff) | |
| download | lwn-c01a1cb6848c9b399cd4471cdd7d2393c46a56e8.tar.gz lwn-c01a1cb6848c9b399cd4471cdd7d2393c46a56e8.zip | |
vlan: kill vlan_put_tag helper
[ Upstream commit b4bef1b57544b18899eb15569e3bafd8d2eeeff6 ]
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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/if_vlan.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h index d69f0577a319..2b1283245b56 100644 --- a/include/linux/if_vlan.h +++ b/include/linux/if_vlan.h @@ -357,24 +357,6 @@ static inline struct sk_buff *__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)) { - return __vlan_hwaccel_put_tag(skb, vlan_proto, vlan_tci); - } 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 |