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

Commit ab09b95c authored by John W. Linville's avatar John W. Linville
Browse files

Merge tag 'mac80211-for-john-2014-09-08' of... 

Merge tag 'mac80211-for-john-2014-09-08' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211



Johannes Berg <johannes@sipsolutions.net> says:

"Two more fixes for mac80211 - one of them addresses a long-standing
issue that we only found when using vendor events more frequently;
the other addresses some bad information being reported in userspace
that people were starting to actually look at."

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parents 1bd3fa7b 785e21a8

net/mac80211/sta_info.c

+1 −1
Original line number Diff line number Diff line
@@ -1822,7 +1822,7 @@ void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo) 
		sinfo->bss_param.flags |= BSS_PARAM_FLAGS_SHORT_PREAMBLE;

	if (sdata->vif.bss_conf.use_short_slot)

		sinfo->bss_param.flags |= BSS_PARAM_FLAGS_SHORT_SLOT_TIME;

	sinfo->bss_param.dtim_period = sdata->local->hw.conf.ps_dtim_period;

	sinfo->bss_param.dtim_period = sdata->vif.bss_conf.dtim_period;

	sinfo->bss_param.beacon_interval = sdata->vif.bss_conf.beacon_int;



	sinfo->sta_flags.set = 0;

net/wireless/nl80211.c

+6 −0
Original line number Diff line number Diff line
@@ -6969,6 +6969,9 @@ void __cfg80211_send_event_skb(struct sk_buff *skb, gfp_t gfp) 
	struct nlattr *data = ((void **)skb->cb)[2];

	enum nl80211_multicast_groups mcgrp = NL80211_MCGRP_TESTMODE;



	/* clear CB data for netlink core to own from now on */

	memset(skb->cb, 0, sizeof(skb->cb));



	nla_nest_end(skb, data);

	genlmsg_end(skb, hdr);
@@ -9294,6 +9297,9 @@ int cfg80211_vendor_cmd_reply(struct sk_buff *skb) 
	void *hdr = ((void **)skb->cb)[1];

	struct nlattr *data = ((void **)skb->cb)[2];



	/* clear CB data for netlink core to own from now on */

	memset(skb->cb, 0, sizeof(skb->cb));



	if (WARN_ON(!rdev->cur_cmd_info)) {

		kfree_skb(skb);

		return -EINVAL;