Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6cd5fb2 authored by Amar Singhal's avatar Amar Singhal
Browse files

nl80211: Correct the usage of command NL80211_CMD_VENDOR 



Add the flag NL80211_FLAG_NEED_WIPHY to the doit definition of
NL80211_CMD_VENDOR. Also assign/pass the cur_cmd_info parameter
correctly. This fixes a merge error when open source commit
ad7e718c9b4f717823fd920a0103f7b0fb06183f was pulled into the tree.

CRs-Fixed: 630797
Change-Id: I2a5a2a93ad3e95ff0d0c56edb9af6af2f71eac4b
Signed-off-by: default avatarAmar Singhal <asinghal@codeaurora.org>
parent c35ae825

net/wireless/nl80211.c

+11 −6
Original line number Diff line number Diff line
@@ -8494,8 +8494,8 @@ static int nl80211_crit_protocol_stop(struct sk_buff *skb, 
static int nl80211_vendor_cmd(struct sk_buff *skb, struct genl_info *info)

{

	struct cfg80211_registered_device *rdev = info->user_ptr[0];

	struct net_device *dev = info->user_ptr[1];

	struct wireless_dev *wdev = dev->ieee80211_ptr;

	struct wireless_dev *wdev =

		__cfg80211_wdev_from_attrs(genl_info_net(info), info->attrs);

	int i, err;

	u32 vid, subcmd;
@@ -8549,8 +8549,12 @@ static int nl80211_vendor_cmd(struct sk_buff *skb, struct genl_info *info) 
			len = nla_len(info->attrs[NL80211_ATTR_VENDOR_DATA]);

		}



		return rdev->wiphy.vendor_commands[i].doit(&rdev->wiphy, wdev,

		rdev->cur_cmd_info = info;

		err = rdev->wiphy.vendor_commands[i].doit(&rdev->wiphy, wdev,

							   data, len);

		rdev->cur_cmd_info = NULL;



		return err;

	}



	return -EOPNOTSUPP;
@@ -8567,8 +8571,8 @@ struct sk_buff *__cfg80211_alloc_reply_skb(struct wiphy *wiphy, 
		return NULL;



	return __cfg80211_alloc_vendor_skb(rdev, approxlen,

					   0,

					   0,

					   rdev->cur_cmd_info->snd_portid,

					   rdev->cur_cmd_info->snd_seq,

					   cmd, attr, NULL, GFP_KERNEL);

}

EXPORT_SYMBOL(__cfg80211_alloc_reply_skb);
@@ -9351,7 +9355,8 @@ static struct genl_ops nl80211_ops[] = { 
		.doit = nl80211_vendor_cmd,

		.policy = nl80211_policy,

		.flags = GENL_ADMIN_PERM,

		.internal_flags = NL80211_FLAG_NEED_RTNL,

		.internal_flags = NL80211_FLAG_NEED_WIPHY |

				  NL80211_FLAG_NEED_RTNL,

	},

	{

		.cmd = NL80211_CMD_SET_QOS_MAP,