Commit 7e6e1b57 authored by Nicolas Dichtel's avatar Nicolas Dichtel Committed by David S. Miller
Browse files

rtnetlink: advertise allmulti counter 



Like what was done with IFLA_PROMISCUITY, add IFLA_ALLMULTI to advertise
the allmulti counter.
The flag IFF_ALLMULTI is advertised only if it was directly set by a
userland app.

Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent da970726

include/uapi/linux/if_link.h

+1 −0
Original line number Diff line number Diff line
@@ -370,6 +370,7 @@ enum { 
	IFLA_GRO_MAX_SIZE,

	IFLA_TSO_MAX_SIZE,

	IFLA_TSO_MAX_SEGS,

	IFLA_ALLMULTI,		/* Allmulti count: > 0 means acts ALLMULTI */



	__IFLA_MAX

};

net/core/rtnetlink.c

+3 −0
Original line number Diff line number Diff line
@@ -1057,6 +1057,7 @@ static noinline size_t if_nlmsg_size(const struct net_device *dev, 
	       + nla_total_size(4) /* IFLA_MASTER */

	       + nla_total_size(1) /* IFLA_CARRIER */

	       + nla_total_size(4) /* IFLA_PROMISCUITY */

	       + nla_total_size(4) /* IFLA_ALLMULTI */

	       + nla_total_size(4) /* IFLA_NUM_TX_QUEUES */

	       + nla_total_size(4) /* IFLA_NUM_RX_QUEUES */

	       + nla_total_size(4) /* IFLA_GSO_MAX_SEGS */
@@ -1765,6 +1766,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, 
	    nla_put_u32(skb, IFLA_MAX_MTU, dev->max_mtu) ||

	    nla_put_u32(skb, IFLA_GROUP, dev->group) ||

	    nla_put_u32(skb, IFLA_PROMISCUITY, dev->promiscuity) ||

	    nla_put_u32(skb, IFLA_ALLMULTI, dev->allmulti) ||

	    nla_put_u32(skb, IFLA_NUM_TX_QUEUES, dev->num_tx_queues) ||

	    nla_put_u32(skb, IFLA_GSO_MAX_SEGS, dev->gso_max_segs) ||

	    nla_put_u32(skb, IFLA_GSO_MAX_SIZE, dev->gso_max_size) ||
@@ -1926,6 +1928,7 @@ static const struct nla_policy ifla_policy[IFLA_MAX+1] = { 
	[IFLA_GRO_MAX_SIZE]	= { .type = NLA_U32 },

	[IFLA_TSO_MAX_SIZE]	= { .type = NLA_REJECT },

	[IFLA_TSO_MAX_SEGS]	= { .type = NLA_REJECT },

	[IFLA_ALLMULTI]		= { .type = NLA_REJECT },

};



static const struct nla_policy ifla_info_policy[IFLA_INFO_MAX+1] = {