mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
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
This commit is contained in:
commit
36099365c7
185 changed files with 7517 additions and 3611 deletions
|
|
@ -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))
|
||||
|
|
|
|||
Loading…
Reference in a new issue