lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

Browse Source 
Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/net/wireless/ipw2x00/ipw2200.c
This commit is contained in:
John W. Linville
2010-10-08 15:39:28 -04:00
parent dd53df265b 15a6321d1c
commit e9a68707d7
146 changed files with 4277 additions and 4237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
net/netlink/genetlink.c
View File

@@ -547,8 +547,20 @@ static int genl_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
info.userhdr = nlmsg_data(nlh) + GENL_HDRLEN;
info.attrs = family->attrbuf;
genl_info_net_set(&info, net);
memset(&info.user_ptr, 0, sizeof(info.user_ptr));
return ops->doit(skb, &info);
if (family->pre_doit) {
err = family->pre_doit(ops, skb, &info);
if (err)
return err;
}
err = ops->doit(skb, &info);
if (family->post_doit)
family->post_doit(ops, skb, &info);
return err;
}
static void genl_rcv(struct sk_buff *skb)