Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6dcbbe25 authored by Neil Horman's avatar Neil Horman Committed by David S. Miller
Browse files

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: default avatarNeil Horman <nhorman@tuxdriver.com>
CC: davem@davemloft.net
CC: bhutchings@solarflare.com
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 22e95ac8

include/linux/if_vlan.h

+5 −0
Original line number Diff line number Diff line
@@ -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)

net/8021q/vlan.h

+0 −5
Original line number Diff line number Diff line
@@ -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;