diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-06-24 15:25:51 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-06-24 15:25:51 -0400 |
| commit | 36099365c7cc64e5184b66b6eb094950a13f540c (patch) | |
| tree | c91b9f3719f94864a62f2d15a71aaecd54c56711 /net/netlink | |
| parent | 22c8c9343258feda9ea9ebb9e5f8cbb727b69454 (diff) | |
| parent | f70490e6078abe1182437e629f67a7f0b6f08cd4 (diff) | |
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')
| -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) | |||
| 1696 | if (!nlh) | 1696 | if (!nlh) |
| 1697 | goto errout_skb; | 1697 | goto errout_skb; |
| 1698 | 1698 | ||
| 1699 | nl_dump_check_consistent(cb, nlh); | ||
| 1700 | |||
| 1699 | memcpy(nlmsg_data(nlh), &len, sizeof(len)); | 1701 | memcpy(nlmsg_data(nlh), &len, sizeof(len)); |
| 1700 | 1702 | ||
| 1701 | if (sk_filter(sk, skb)) | 1703 | if (sk_filter(sk, skb)) |