Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Just simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -3906,6 +3906,9 @@ static int rtnl_fill_statsinfo(struct sk_buff *skb, struct net_device *dev,
|
||||
return -EMSGSIZE;
|
||||
|
||||
ifsm = nlmsg_data(nlh);
|
||||
ifsm->family = PF_UNSPEC;
|
||||
ifsm->pad1 = 0;
|
||||
ifsm->pad2 = 0;
|
||||
ifsm->ifindex = dev->ifindex;
|
||||
ifsm->filter_mask = filter_mask;
|
||||
|
||||
|
Reference in New Issue
Block a user