diff options
author | Tony Luck <tony.luck@intel.com> | 2005-06-29 15:21:41 -0700 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-06-29 15:21:41 -0700 |
commit | d18bfacff20f08aecf01bb971b110ca108eef3c7 (patch) | |
tree | 255f862839c593c796e609328575b611e3f56cf3 /net/core/wireless.c | |
parent | a68db763af9b676590c3fe9ec3f17bf18015eb2f (diff) | |
parent | fd782a4a99d2d3e818b9465c427b10f7f027d7da (diff) | |
download | kernel-crypto-d18bfacff20f08aecf01bb971b110ca108eef3c7.tar.gz kernel-crypto-d18bfacff20f08aecf01bb971b110ca108eef3c7.tar.xz kernel-crypto-d18bfacff20f08aecf01bb971b110ca108eef3c7.zip |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'net/core/wireless.c')
-rw-r--r-- | net/core/wireless.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/core/wireless.c b/net/core/wireless.c index b2fe378dfbf..3ff5639c0b7 100644 --- a/net/core/wireless.c +++ b/net/core/wireless.c @@ -1102,6 +1102,7 @@ static inline int rtnetlink_fill_iwinfo(struct sk_buff * skb, nlh = NLMSG_PUT(skb, 0, 0, type, sizeof(*r)); r = NLMSG_DATA(nlh); r->ifi_family = AF_UNSPEC; + r->__ifi_pad = 0; r->ifi_type = dev->type; r->ifi_index = dev->ifindex; r->ifi_flags = dev->flags; |