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

Commit 4d4f3791 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mac80211-for-davem-2015-12-15' of... 

Merge tag 'mac80211-for-davem-2015-12-15' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211



Johannes Berg says:

====================
Another set of fixes:
 * memory leak fixes (from Ola)
 * operating mode notification spec compliance fix (from Eyal)
 * copy rfkill names in case pointer becomes invalid (myself)
 * two hardware restart fixes (myself)
 * get rid of "limiting TX power" log spam (myself)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 79aa05a2 cf1e05c6

net/mac80211/cfg.c

+1 −2
Original line number Diff line number Diff line
@@ -1169,8 +1169,7 @@ static int sta_apply_parameters(struct ieee80211_local *local, 
		 * rc isn't initialized here yet, so ignore it

		 */

		__ieee80211_vht_handle_opmode(sdata, sta,

					      params->opmode_notif,

					      band, false);

					      params->opmode_notif, band);

	}



	if (ieee80211_vif_is_mesh(&sdata->vif))

net/mac80211/ieee80211_i.h

+2 −2
Original line number Diff line number Diff line
@@ -1709,10 +1709,10 @@ enum ieee80211_sta_rx_bandwidth ieee80211_sta_cur_vht_bw(struct sta_info *sta); 
void ieee80211_sta_set_rx_nss(struct sta_info *sta);

u32 __ieee80211_vht_handle_opmode(struct ieee80211_sub_if_data *sdata,

                                  struct sta_info *sta, u8 opmode,

                                  enum ieee80211_band band, bool nss_only);

				  enum ieee80211_band band);

void ieee80211_vht_handle_opmode(struct ieee80211_sub_if_data *sdata,

				 struct sta_info *sta, u8 opmode,

				 enum ieee80211_band band, bool nss_only);

				 enum ieee80211_band band);

void ieee80211_apply_vhtcap_overrides(struct ieee80211_sub_if_data *sdata,

				      struct ieee80211_sta_vht_cap *vht_cap);

void ieee80211_get_vht_mask_from_cap(__le16 vht_cap,

net/mac80211/mlme.c

+11 −6
Original line number Diff line number Diff line
@@ -1379,21 +1379,26 @@ static u32 ieee80211_handle_pwr_constr(struct ieee80211_sub_if_data *sdata, 
	 */

	if (has_80211h_pwr &&

	    (!has_cisco_pwr || pwr_level_80211h <= pwr_level_cisco)) {

		new_ap_level = pwr_level_80211h;



		if (sdata->ap_power_level == new_ap_level)

			return 0;



		sdata_dbg(sdata,

			  "Limiting TX power to %d (%d - %d) dBm as advertised by %pM\n",

			  pwr_level_80211h, chan_pwr, pwr_reduction_80211h,

			  sdata->u.mgd.bssid);

		new_ap_level = pwr_level_80211h;

	} else {  /* has_cisco_pwr is always true here. */

		sdata_dbg(sdata,

			  "Limiting TX power to %d dBm as advertised by %pM\n",

			  pwr_level_cisco, sdata->u.mgd.bssid);

		new_ap_level = pwr_level_cisco;

	}



		if (sdata->ap_power_level == new_ap_level)

			return 0;



		sdata_dbg(sdata,

			  "Limiting TX power to %d dBm as advertised by %pM\n",

			  pwr_level_cisco, sdata->u.mgd.bssid);

	}



	sdata->ap_power_level = new_ap_level;

	if (__ieee80211_recalc_txpower(sdata))

		return BSS_CHANGED_TXPOWER;
@@ -3575,7 +3580,7 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata, 


	if (sta && elems.opmode_notif)

		ieee80211_vht_handle_opmode(sdata, sta, *elems.opmode_notif,

					    rx_status->band, true);

					    rx_status->band);

	mutex_unlock(&local->sta_mtx);



	changed |= ieee80211_handle_pwr_constr(sdata, chan, mgmt,

net/mac80211/rx.c

+1 −2
Original line number Diff line number Diff line
@@ -2736,8 +2736,7 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx) 
			opmode = mgmt->u.action.u.vht_opmode_notif.operating_mode;



			ieee80211_vht_handle_opmode(rx->sdata, rx->sta,

						    opmode, status->band,

						    false);

						    opmode, status->band);

			goto handled;

		}

		default:

net/mac80211/util.c

+63 −50
Original line number Diff line number Diff line
@@ -1641,6 +1641,29 @@ void ieee80211_stop_device(struct ieee80211_local *local) 
	drv_stop(local);

}



static void ieee80211_flush_completed_scan(struct ieee80211_local *local,

					   bool aborted)

{

	/* It's possible that we don't handle the scan completion in

	 * time during suspend, so if it's still marked as completed

	 * here, queue the work and flush it to clean things up.

	 * Instead of calling the worker function directly here, we

	 * really queue it to avoid potential races with other flows

	 * scheduling the same work.

	 */

	if (test_bit(SCAN_COMPLETED, &local->scanning)) {

		/* If coming from reconfiguration failure, abort the scan so

		 * we don't attempt to continue a partial HW scan - which is

		 * possible otherwise if (e.g.) the 2.4 GHz portion was the

		 * completed scan, and a 5 GHz portion is still pending.

		 */

		if (aborted)

			set_bit(SCAN_ABORTED, &local->scanning);

		ieee80211_queue_delayed_work(&local->hw, &local->scan_work, 0);

		flush_delayed_work(&local->scan_work);

	}

}



static void ieee80211_handle_reconfig_failure(struct ieee80211_local *local)

{

	struct ieee80211_sub_if_data *sdata;
@@ -1660,6 +1683,8 @@ static void ieee80211_handle_reconfig_failure(struct ieee80211_local *local) 
	local->suspended = false;

	local->in_reconfig = false;



	ieee80211_flush_completed_scan(local, true);



	/* scheduled scan clearly can't be running any more, but tell

	 * cfg80211 and clear local state

	 */
@@ -1698,6 +1723,27 @@ static void ieee80211_assign_chanctx(struct ieee80211_local *local, 
	mutex_unlock(&local->chanctx_mtx);

}



static void ieee80211_reconfig_stations(struct ieee80211_sub_if_data *sdata)

{

	struct ieee80211_local *local = sdata->local;

	struct sta_info *sta;



	/* add STAs back */

	mutex_lock(&local->sta_mtx);

	list_for_each_entry(sta, &local->sta_list, list) {

		enum ieee80211_sta_state state;



		if (!sta->uploaded || sta->sdata != sdata)

			continue;



		for (state = IEEE80211_STA_NOTEXIST;

		     state < sta->sta_state; state++)

			WARN_ON(drv_sta_state(local, sta->sdata, sta, state,

					      state + 1));

	}

	mutex_unlock(&local->sta_mtx);

}



int ieee80211_reconfig(struct ieee80211_local *local)

{

	struct ieee80211_hw *hw = &local->hw;
@@ -1833,50 +1879,11 @@ int ieee80211_reconfig(struct ieee80211_local *local) 
				WARN_ON(drv_add_chanctx(local, ctx));

		mutex_unlock(&local->chanctx_mtx);



		list_for_each_entry(sdata, &local->interfaces, list) {

			if (!ieee80211_sdata_running(sdata))

				continue;

			ieee80211_assign_chanctx(local, sdata);

		}



		sdata = rtnl_dereference(local->monitor_sdata);

		if (sdata && ieee80211_sdata_running(sdata))

			ieee80211_assign_chanctx(local, sdata);

	}



	/* add STAs back */

	mutex_lock(&local->sta_mtx);

	list_for_each_entry(sta, &local->sta_list, list) {

		enum ieee80211_sta_state state;



		if (!sta->uploaded)

			continue;



		/* AP-mode stations will be added later */

		if (sta->sdata->vif.type == NL80211_IFTYPE_AP)

			continue;



		for (state = IEEE80211_STA_NOTEXIST;

		     state < sta->sta_state; state++)

			WARN_ON(drv_sta_state(local, sta->sdata, sta, state,

					      state + 1));

	}

	mutex_unlock(&local->sta_mtx);



	/* reconfigure tx conf */

	if (hw->queues >= IEEE80211_NUM_ACS) {

		list_for_each_entry(sdata, &local->interfaces, list) {

			if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN ||

			    sdata->vif.type == NL80211_IFTYPE_MONITOR ||

			    !ieee80211_sdata_running(sdata))

				continue;



			for (i = 0; i < IEEE80211_NUM_ACS; i++)

				drv_conf_tx(local, sdata, i,

					    &sdata->tx_conf[i]);

		}

	}



	/* reconfigure hardware */

	ieee80211_hw_config(local, ~0);
@@ -1889,6 +1896,22 @@ int ieee80211_reconfig(struct ieee80211_local *local) 
		if (!ieee80211_sdata_running(sdata))

			continue;



		ieee80211_assign_chanctx(local, sdata);



		switch (sdata->vif.type) {

		case NL80211_IFTYPE_AP_VLAN:

		case NL80211_IFTYPE_MONITOR:

			break;

		default:

			ieee80211_reconfig_stations(sdata);

			/* fall through */

		case NL80211_IFTYPE_AP: /* AP stations are handled later */

			for (i = 0; i < IEEE80211_NUM_ACS; i++)

				drv_conf_tx(local, sdata, i,

					    &sdata->tx_conf[i]);

			break;

		}



		/* common change flags for all interface types */

		changed = BSS_CHANGED_ERP_CTS_PROT |

			  BSS_CHANGED_ERP_PREAMBLE |
@@ -2074,17 +2097,7 @@ int ieee80211_reconfig(struct ieee80211_local *local) 
	mb();

	local->resuming = false;



	/* It's possible that we don't handle the scan completion in

	 * time during suspend, so if it's still marked as completed

	 * here, queue the work and flush it to clean things up.

	 * Instead of calling the worker function directly here, we

	 * really queue it to avoid potential races with other flows

	 * scheduling the same work.

	 */

	if (test_bit(SCAN_COMPLETED, &local->scanning)) {

		ieee80211_queue_delayed_work(&local->hw, &local->scan_work, 0);

		flush_delayed_work(&local->scan_work);

	}

	ieee80211_flush_completed_scan(local, false);



	if (local->open_count && !reconfig_due_to_wowlan)

		drv_reconfig_complete(local, IEEE80211_RECONFIG_TYPE_SUSPEND);