Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211 (48c3e371) · Commits · e / devices / android_kernel_fairphone_FP3

net/wireless/nl80211.c

+11 −11

Original line number	Diff line number	Diff line
		@@ -2622,8 +2622,8 @@ static int nl80211_get_key(struct sk_buff skb, struct genl_info info)

		hdr = nl80211hdr_put(msg, info->snd_portid, info->snd_seq, 0,
		NL80211_CMD_NEW_KEY);
		if (IS_ERR(hdr))
		return PTR_ERR(hdr);
		if (!hdr)
		return -ENOBUFS;

		cookie.msg = msg;
		cookie.idx = key_idx;
		@@ -6507,6 +6507,9 @@ static int nl80211_testmode_dump(struct sk_buff *skb,
		NL80211_CMD_TESTMODE);
		struct nlattr *tmdata;

		if (!hdr)
		break;

		if (nla_put_u32(skb, NL80211_ATTR_WIPHY, phy_idx)) {
		genlmsg_cancel(skb, hdr);
		break;
		@@ -6951,9 +6954,8 @@ static int nl80211_remain_on_channel(struct sk_buff *skb,

		hdr = nl80211hdr_put(msg, info->snd_portid, info->snd_seq, 0,
		NL80211_CMD_REMAIN_ON_CHANNEL);

		if (IS_ERR(hdr)) {
		err = PTR_ERR(hdr);
		if (!hdr) {
		err = -ENOBUFS;
		goto free_msg;
		}

		@@ -7251,9 +7253,8 @@ static int nl80211_tx_mgmt(struct sk_buff skb, struct genl_info info)

		hdr = nl80211hdr_put(msg, info->snd_portid, info->snd_seq, 0,
		NL80211_CMD_FRAME);

		if (IS_ERR(hdr)) {
		err = PTR_ERR(hdr);
		if (!hdr) {
		err = -ENOBUFS;
		goto free_msg;
		}
		}
		@@ -8132,9 +8133,8 @@ static int nl80211_probe_client(struct sk_buff *skb,

		hdr = nl80211hdr_put(msg, info->snd_portid, info->snd_seq, 0,
		NL80211_CMD_PROBE_CLIENT);

		if (IS_ERR(hdr)) {
		err = PTR_ERR(hdr);
		if (!hdr) {
		err = -ENOBUFS;
		goto free_msg;
		}

+4 −6

Original line number	Diff line number	Diff line
		@@ -976,21 +976,19 @@ int cfg80211_disconnect(struct cfg80211_registered_device *rdev,
		struct net_device *dev, u16 reason, bool wextev)
		{
		struct wireless_dev *wdev = dev->ieee80211_ptr;
		int err;
		int err = 0;

		ASSERT_WDEV_LOCK(wdev);

		kfree(wdev->connect_keys);
		wdev->connect_keys = NULL;

		if (wdev->conn) {
		if (wdev->conn)
		err = cfg80211_sme_disconnect(wdev, reason);
		} else if (!rdev->ops->disconnect) {
		else if (!rdev->ops->disconnect)
		cfg80211_mlme_down(rdev, dev);
		err = 0;
		} else {
		else if (wdev->current_bss)
		err = rdev_disconnect(rdev, dev, reason);
		}

		return err;
		}