diff options
| author | David S. Miller | 2017-10-06 02:57:03 +0200 |
|---|---|---|
| committer | David S. Miller | 2017-10-06 03:19:22 +0200 |
| commit | 53954cf8c5d205624167a2bfd117cc0c1a5f3c6d (patch) | |
| tree | a287f0c80eb616758bb5212523c8fb3d8fc350a4 /net/core/rtnetlink.c | |
| parent | Merge branch 'bpftool' (diff) | |
| parent | Merge tag 'pm-4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafa... (diff) | |
| download | kernel-qcow2-linux-53954cf8c5d205624167a2bfd117cc0c1a5f3c6d.tar.gz kernel-qcow2-linux-53954cf8c5d205624167a2bfd117cc0c1a5f3c6d.tar.xz kernel-qcow2-linux-53954cf8c5d205624167a2bfd117cc0c1a5f3c6d.zip | |
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>
Diffstat (limited to 'net/core/rtnetlink.c')
| -rw-r--r-- | net/core/rtnetlink.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index c5ee429bcce9..e84d108cfee4 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -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; |