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

Commit ed416309 authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by David S. Miller
Browse files

bridge: netlink: export topology_change and topology_change_detected 



Add IFLA_BR_TOPOLOGY_CHANGE and IFLA_BR_TOPOLOGY_CHANGE_DETECTED and
export them via netlink.

Signed-off-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 684dd248

include/uapi/linux/if_link.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -237,6 +237,8 @@ enum { 
	IFLA_BR_BRIDGE_ID,

	IFLA_BR_BRIDGE_ID,

	IFLA_BR_ROOT_PORT,

	IFLA_BR_ROOT_PORT,

	IFLA_BR_ROOT_PATH_COST,

	IFLA_BR_ROOT_PATH_COST,

	IFLA_BR_TOPOLOGY_CHANGE,

	IFLA_BR_TOPOLOGY_CHANGE_DETECTED,

	__IFLA_BR_MAX,

	__IFLA_BR_MAX,

};

};

net/bridge/br_netlink.c

+6 −1
Original line number Original line Diff line number Diff line
@@ -858,6 +858,8 @@ static size_t br_get_size(const struct net_device *brdev) 
	       nla_total_size(sizeof(struct ifla_bridge_id)) +   /* IFLA_BR_BRIDGE_ID */

	       nla_total_size(sizeof(struct ifla_bridge_id)) +   /* IFLA_BR_BRIDGE_ID */

	       nla_total_size(sizeof(u16)) +    /* IFLA_BR_ROOT_PORT */

	       nla_total_size(sizeof(u16)) +    /* IFLA_BR_ROOT_PORT */

	       nla_total_size(sizeof(u32)) +    /* IFLA_BR_ROOT_PATH_COST */

	       nla_total_size(sizeof(u32)) +    /* IFLA_BR_ROOT_PATH_COST */

	       nla_total_size(sizeof(u8)) +    /* IFLA_BR_TOPOLOGY_CHANGE */

	       nla_total_size(sizeof(u8)) +    /* IFLA_BR_TOPOLOGY_CHANGE_DETECTED */

	       0;

	       0;

}

}
@@ -892,7 +894,10 @@ static int br_fill_info(struct sk_buff *skb, const struct net_device *brdev) 
	    nla_put(skb, IFLA_BR_ROOT_ID, sizeof(root_id), &root_id) ||

	    nla_put(skb, IFLA_BR_ROOT_ID, sizeof(root_id), &root_id) ||

	    nla_put(skb, IFLA_BR_BRIDGE_ID, sizeof(bridge_id), &bridge_id) ||

	    nla_put(skb, IFLA_BR_BRIDGE_ID, sizeof(bridge_id), &bridge_id) ||

	    nla_put_u16(skb, IFLA_BR_ROOT_PORT, br->root_port) ||

	    nla_put_u16(skb, IFLA_BR_ROOT_PORT, br->root_port) ||

	    nla_put_u32(skb, IFLA_BR_ROOT_PATH_COST, br->root_path_cost))

	    nla_put_u32(skb, IFLA_BR_ROOT_PATH_COST, br->root_path_cost) ||

	    nla_put_u8(skb, IFLA_BR_TOPOLOGY_CHANGE, br->topology_change) ||

	    nla_put_u8(skb, IFLA_BR_TOPOLOGY_CHANGE_DETECTED,

		       br->topology_change_detected))

		return -EMSGSIZE;

		return -EMSGSIZE;





#ifdef CONFIG_BRIDGE_VLAN_FILTERING

#ifdef CONFIG_BRIDGE_VLAN_FILTERING