diff options
| author | Neil Horman <nhorman@tuxdriver.com> | 2011-05-24 10:31:08 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-25 23:55:23 +0200 |
| commit | 6dcbbe25dcc9bd2bdeb4f685f8fb874ffc10e6be (patch) | |
| tree | 8e8147187fe6be8b909445c6541f58c4ef474b2b | |
| parent | Merge branch 'for-davem' of ssh://master.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| download | linux-6dcbbe25dcc9bd2bdeb4f685f8fb874ffc10e6be.tar.xz linux-6dcbbe25dcc9bd2bdeb4f685f8fb874ffc10e6be.zip | |
net: move is_vlan_dev into public header file (v2)
Migrate is_vlan_dev() to if_vlan.h so that core networkig can use it
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
CC: davem@davemloft.net
CC: bhutchings@solarflare.com
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/linux/if_vlan.h | 5 | ||||
| -rw-r--r-- | net/8021q/vlan.h | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h index 290bd8ac94cf..dc01681fbb42 100644 --- a/include/linux/if_vlan.h +++ b/include/linux/if_vlan.h @@ -110,6 +110,11 @@ static inline void vlan_group_set_device(struct vlan_group *vg, array[vlan_id % VLAN_GROUP_ARRAY_PART_LEN] = dev; } +static inline int is_vlan_dev(struct net_device *dev) +{ + return dev->priv_flags & IFF_802_1Q_VLAN; +} + #define vlan_tx_tag_present(__skb) ((__skb)->vlan_tci & VLAN_TAG_PRESENT) #define vlan_tx_tag_get(__skb) ((__skb)->vlan_tci & ~VLAN_TAG_PRESENT) diff --git a/net/8021q/vlan.h b/net/8021q/vlan.h index c3408def8a19..9da07e30d1a2 100644 --- a/net/8021q/vlan.h +++ b/net/8021q/vlan.h @@ -118,11 +118,6 @@ extern void vlan_netlink_fini(void); extern struct rtnl_link_ops vlan_link_ops; -static inline int is_vlan_dev(struct net_device *dev) -{ - return dev->priv_flags & IFF_802_1Q_VLAN; -} - extern int vlan_net_id; struct proc_dir_entry; |