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

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

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211

parents 9b8ba9f5 864a6040

net/mac80211/chan.c

+6 −0
Original line number Diff line number Diff line
@@ -100,6 +100,12 @@ ieee80211_get_chanctx_max_required_bw(struct ieee80211_local *local, 
		}

		max_bw = max(max_bw, width);

	}



	/* use the configured bandwidth in case of monitor interface */

	sdata = rcu_dereference(local->monitor_sdata);

	if (sdata && rcu_access_pointer(sdata->vif.chanctx_conf) == conf)

		max_bw = max(max_bw, conf->def.width);



	rcu_read_unlock();



	return max_bw;

net/mac80211/mesh_ps.c

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ static struct sk_buff *mps_qos_null_get(struct sta_info *sta) 
				      sdata->vif.addr);

	nullfunc->frame_control = fc;

	nullfunc->duration_id = 0;

	nullfunc->seq_ctrl = 0;

	/* no address resolution for this frame -> set addr 1 immediately */

	memcpy(nullfunc->addr1, sta->sta.addr, ETH_ALEN);

	memset(skb_put(skb, 2), 0, 2); /* append QoS control field */

net/mac80211/sta_info.c

+1 −0
Original line number Diff line number Diff line
@@ -1206,6 +1206,7 @@ static void ieee80211_send_null_response(struct ieee80211_sub_if_data *sdata, 
	memcpy(nullfunc->addr1, sta->sta.addr, ETH_ALEN);

	memcpy(nullfunc->addr2, sdata->vif.addr, ETH_ALEN);

	memcpy(nullfunc->addr3, sdata->vif.addr, ETH_ALEN);

	nullfunc->seq_ctrl = 0;



	skb->priority = tid;

	skb_set_queue_mapping(skb, ieee802_1d_to_ac[tid]);

net/wireless/core.c

+0 −2
Original line number Diff line number Diff line
@@ -788,8 +788,6 @@ void cfg80211_leave(struct cfg80211_registered_device *rdev, 
	default:

		break;

	}



	wdev->beacon_interval = 0;

}



static int cfg80211_netdev_notifier_call(struct notifier_block *nb,