Commit 536d1d4a authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

vlan: move vlan_group_[gs]et_device to public header 



there are no users outside vlan code

Signed-off-by: default avatarJiri Pirko <jpirko@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7890a5b9

include/linux/if_vlan.h

+0 −19
Original line number Diff line number Diff line
@@ -91,25 +91,6 @@ struct vlan_group { 
	struct rcu_head		rcu;

};



static inline struct net_device *vlan_group_get_device(struct vlan_group *vg,

						       u16 vlan_id)

{

	struct net_device **array;

	array = vg->vlan_devices_arrays[vlan_id / VLAN_GROUP_ARRAY_PART_LEN];

	return array ? array[vlan_id % VLAN_GROUP_ARRAY_PART_LEN] : NULL;

}



static inline void vlan_group_set_device(struct vlan_group *vg,

					 u16 vlan_id,

					 struct net_device *dev)

{

	struct net_device **array;

	if (!vg)

		return;

	array = vg->vlan_devices_arrays[vlan_id / VLAN_GROUP_ARRAY_PART_LEN];

	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;

net/8021q/vlan.h

+19 −0
Original line number Diff line number Diff line
@@ -74,6 +74,25 @@ static inline struct vlan_dev_info *vlan_dev_info(const struct net_device *dev) 
	return netdev_priv(dev);

}



static inline struct net_device *vlan_group_get_device(struct vlan_group *vg,

						       u16 vlan_id)

{

	struct net_device **array;

	array = vg->vlan_devices_arrays[vlan_id / VLAN_GROUP_ARRAY_PART_LEN];

	return array ? array[vlan_id % VLAN_GROUP_ARRAY_PART_LEN] : NULL;

}



static inline void vlan_group_set_device(struct vlan_group *vg,

					 u16 vlan_id,

					 struct net_device *dev)

{

	struct net_device **array;

	if (!vg)

		return;

	array = vg->vlan_devices_arrays[vlan_id / VLAN_GROUP_ARRAY_PART_LEN];

	array[vlan_id % VLAN_GROUP_ARRAY_PART_LEN] = dev;

}



/* Must be invoked with rcu_read_lock or with RTNL. */

static inline struct net_device *vlan_find_dev(struct net_device *real_dev,

					       u16 vlan_id)