Commit 31aed46f authored by wenxu's avatar wenxu Committed by Pablo Neira Ayuso
Browse files

bridge: add br_vlan_get_proto() 



This new function allows you to fetch the bridge port vlan protocol.

Signed-off-by: default avatarwenxu <wenxu@ucloud.cn>
Acked-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent c54c7c68

include/linux/if_bridge.h

+6 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ static inline bool br_multicast_router(const struct net_device *dev) 
bool br_vlan_enabled(const struct net_device *dev);

int br_vlan_get_pvid(const struct net_device *dev, u16 *p_pvid);

int br_vlan_get_pvid_rcu(const struct net_device *dev, u16 *p_pvid);

int br_vlan_get_proto(const struct net_device *dev, u16 *p_proto);

int br_vlan_get_info(const struct net_device *dev, u16 vid,

		     struct bridge_vlan_info *p_vinfo);

#else
@@ -102,6 +103,11 @@ static inline int br_vlan_get_pvid(const struct net_device *dev, u16 *p_pvid) 
	return -EINVAL;

}



static inline int br_vlan_get_proto(const struct net_device *dev, u16 *p_proto)

{

	return -EINVAL;

}



static inline int br_vlan_get_pvid_rcu(const struct net_device *dev, u16 *p_pvid)

{

	return -EINVAL;

net/bridge/br_vlan.c

+10 −0
Original line number Diff line number Diff line
@@ -797,6 +797,16 @@ bool br_vlan_enabled(const struct net_device *dev) 
}

EXPORT_SYMBOL_GPL(br_vlan_enabled);



int br_vlan_get_proto(const struct net_device *dev, u16 *p_proto)

{

	struct net_bridge *br = netdev_priv(dev);



	*p_proto = ntohs(br->vlan_proto);



	return 0;

}

EXPORT_SYMBOL_GPL(br_vlan_get_proto);



int __br_vlan_set_proto(struct net_bridge *br, __be16 proto)

{

	int err = 0;