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

net: bridge: mcast: account for ipv6 size when dumping querier state 



We need to account for the IPv6 attributes when dumping querier state.

Fixes: 5e924fe6ccfd ("net: bridge: mcast: dump ipv6 querier state")
Signed-off-by: default avatarNikolay Aleksandrov <nikolay@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cdda378b

net/bridge/br_multicast.c

+7 −1
Original line number Diff line number Diff line
@@ -2931,7 +2931,13 @@ size_t br_multicast_querier_state_size(void) 
	return nla_total_size(0) +		/* nest attribute */

	       nla_total_size(sizeof(__be32)) + /* BRIDGE_QUERIER_IP_ADDRESS */

	       nla_total_size(sizeof(int)) +    /* BRIDGE_QUERIER_IP_PORT */

	       nla_total_size_64bit(sizeof(u64)); /* BRIDGE_QUERIER_IP_OTHER_TIMER */

	       nla_total_size_64bit(sizeof(u64)) + /* BRIDGE_QUERIER_IP_OTHER_TIMER */

#if IS_ENABLED(CONFIG_IPV6)

	       nla_total_size(sizeof(struct in6_addr)) + /* BRIDGE_QUERIER_IPV6_ADDRESS */

	       nla_total_size(sizeof(int)) +		 /* BRIDGE_QUERIER_IPV6_PORT */

	       nla_total_size_64bit(sizeof(u64)) +	 /* BRIDGE_QUERIER_IPV6_OTHER_TIMER */

#endif

	       0;

}



/* protected by rtnl or rcu */