xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Browse Source 
Conflicts:
	net/mac80211/sta_info.c
	net/wireless/core.h

Two minor conflicts in wireless.  Overlapping additions of extern
declarations in net/wireless/core.h and a bug fix overlapping with
the addition of a boolean parameter to __ieee80211_key_free().

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2013-04-01 13:36:50 -04:00
parent 7d4c04fc17 3658f36040
commit a210576cf8
201 changed files with 2572 additions and 1438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/core/rtnetlink.c
View File

@@ -496,8 +496,10 @@ static int rtnl_link_fill(struct sk_buff *skb, const struct net_device *dev)
}
if (ops->fill_info) {
data = nla_nest_start(skb, IFLA_INFO_DATA);
if (data == NULL)
if (data == NULL) {
err = -EMSGSIZE;
goto err_cancel_link;
}
err = ops->fill_info(skb, dev);
if (err < 0)
goto err_cancel_data;