diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-15 10:53:14 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-15 10:53:14 +0200 |
| commit | bb12d86e9fa99cc23927d5c90b125c31534ecf14 (patch) | |
| tree | 9d7a6d3b4a13323863d3799ba289e120ff698d38 /include/linux/if_vlan.h | |
| parent | 51e809ee973d95a49753d554753e1c65a507b0b2 (diff) | |
| parent | af4733b50b52d6112c15a2f0253954fc244a81ca (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android
Diffstat (limited to 'include/linux/if_vlan.h')
| -rw-r--r-- | include/linux/if_vlan.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h index 72ba6f5cbc8d..2abe67bd4df8 100644 --- a/include/linux/if_vlan.h +++ b/include/linux/if_vlan.h @@ -186,7 +186,6 @@ vlan_dev_get_egress_qos_mask(struct net_device *dev, u32 skprio) } extern bool vlan_do_receive(struct sk_buff **skb); -extern struct sk_buff *vlan_untag(struct sk_buff *skb); extern int vlan_vid_add(struct net_device *dev, __be16 proto, u16 vid); extern void vlan_vid_del(struct net_device *dev, __be16 proto, u16 vid); @@ -228,11 +227,6 @@ static inline bool vlan_do_receive(struct sk_buff **skb) return false; } -static inline struct sk_buff *vlan_untag(struct sk_buff *skb) -{ - return skb; -} - static inline int vlan_vid_add(struct net_device *dev, __be16 proto, u16 vid) { return 0; |