Merge "nl80211: nl80211hdr_put() doesn't return an ERR_PTR" (b81df7a8) · Commits · e / devices / android_kernel_sony_msm8994

net/wireless/nl80211.c

+11 −11

Original line number	Diff line number	Diff line
		@@ -2682,8 +2682,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;
		@@ -6708,6 +6708,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;
		@@ -7120,9 +7123,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;
		}

		@@ -7409,9 +7411,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;
		}
		}
		@@ -8272,9 +8273,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;
		}