linux-next: manual merge of the wireless-next tree with the net-next tree

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi John,

Today's linux-next merge of the wireless-next tree got a conflict in
net/wireless/nl80211.c between merge commits from the net-next tree and
commit 86e8cf98de3e ("nl80211: use small state buffer for wiphy_dump")
from the wireless-next tree.

I think I fixed it up (see below, please check) and can carry the fix as
necessary (no action is required).  I think that my fix means that that
commit 86e8cf98de3e is missing the extra "rtnl_unlock();", right?
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc net/wireless/nl80211.c
index e545023,7dc3343..0000000
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@@ -1520,47 -1562,23 +1562,25 @@@ static int nl80211_dump_wiphy_parse(str
  static int nl80211_dump_wiphy(struct sk_buff *skb, struct netlink_callback *cb)
  {
  	int idx = 0, ret;
- 	int start = cb->args[0];
+ 	struct nl80211_dump_wiphy_state *state = (void *)cb->args[0];
  	struct cfg80211_registered_device *dev;
- 	s64 filter_wiphy = -1;
- 	bool split = false;
- 	struct nlattr **tb;
- 	int res;
- 
- 	/* will be zeroed in nlmsg_parse() */
- 	tb = kmalloc(sizeof(*tb) * (NL80211_ATTR_MAX + 1), GFP_KERNEL);
- 	if (!tb)
- 		return -ENOMEM;
  
  	rtnl_lock();
- 
- 	res = nlmsg_parse(cb->nlh, GENL_HDRLEN + nl80211_fam.hdrsize,
- 			  tb, NL80211_ATTR_MAX, nl80211_policy);
- 	if (res == 0) {
- 		split = tb[NL80211_ATTR_SPLIT_WIPHY_DUMP];
- 		if (tb[NL80211_ATTR_WIPHY])
- 			filter_wiphy = nla_get_u32(tb[NL80211_ATTR_WIPHY]);
- 		if (tb[NL80211_ATTR_WDEV])
- 			filter_wiphy = nla_get_u64(tb[NL80211_ATTR_WDEV]) >> 32;
- 		if (tb[NL80211_ATTR_IFINDEX]) {
- 			struct net_device *netdev;
- 			int ifidx = nla_get_u32(tb[NL80211_ATTR_IFINDEX]);
- 
- 			netdev = dev_get_by_index(sock_net(skb->sk), ifidx);
- 			if (!netdev) {
- 				rtnl_unlock();
- 				kfree(tb);
- 				return -ENODEV;
- 			}
- 			if (netdev->ieee80211_ptr) {
- 				dev = wiphy_to_dev(
- 					netdev->ieee80211_ptr->wiphy);
- 				filter_wiphy = dev->wiphy_idx;
- 			}
- 			dev_put(netdev);
+ 	if (!state) {
+ 		state = kzalloc(sizeof(*state), GFP_KERNEL);
 -		if (!state)
++		if (!state) {
++			rtnl_unlock();
+ 			return -ENOMEM;
 +		}
+ 		state->filter_wiphy = -1;
+ 		ret = nl80211_dump_wiphy_parse(skb, cb, state);
+ 		if (ret) {
+ 			kfree(state);
+ 			rtnl_unlock();
+ 			return ret;
+ 		}
+ 		cb->args[0] = (long)state;
  	}
- 	kfree(tb);
  
  	list_for_each_entry(dev, &cfg80211_rdev_list, list) {
  		if (!net_eq(wiphy_net(&dev->wiphy), sock_net(skb->sk)))

Attachment: pgp1XWkKI_2VV.pgp
Description: PGP signature