diff options
| author | John W. Linville | 2011-06-24 21:25:51 +0200 |
|---|---|---|
| committer | John W. Linville | 2011-06-24 21:25:51 +0200 |
| commit | 36099365c7cc64e5184b66b6eb094950a13f540c (patch) | |
| tree | c91b9f3719f94864a62f2d15a71aaecd54c56711 /net/netlink/af_netlink.c | |
| parent | qlcnic: multi protocol internal loopback support added. (diff) | |
| parent | Bluetooth: include scatterlist.h where needed (diff) | |
| download | kernel-qcow2-linux-36099365c7cc64e5184b66b6eb094950a13f540c.tar.gz kernel-qcow2-linux-36099365c7cc64e5184b66b6eb094950a13f540c.tar.xz kernel-qcow2-linux-36099365c7cc64e5184b66b6eb094950a13f540c.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/rtlwifi/pci.c
include/linux/netlink.h
Diffstat (limited to 'net/netlink/af_netlink.c')
| -rw-r--r-- | net/netlink/af_netlink.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index ca5276c51804..0a4db0211da0 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -1696,6 +1696,8 @@ static int netlink_dump(struct sock *sk) if (!nlh) goto errout_skb; + nl_dump_check_consistent(cb, nlh); + memcpy(nlmsg_data(nlh), &len, sizeof(len)); if (sk_filter(sk, skb)) |