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

include/net/cfg80211.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -96,6 +96,7 @@ enum ieee80211_band {
	* is not permitted.		* is not permitted.
	* @IEEE80211_CHAN_NO_HT40MINUS: extension channel below this channel		* @IEEE80211_CHAN_NO_HT40MINUS: extension channel below this channel
	* is not permitted.		* is not permitted.
			* @IEEE80211_CHAN_NO_OFDM: OFDM is not allowed on this channel.
	*/		*/
	enum ieee80211_channel_flags {		enum ieee80211_channel_flags {
	IEEE80211_CHAN_DISABLED = 1<<0,		IEEE80211_CHAN_DISABLED = 1<<0,
	@@ -104,6 +105,7 @@ enum ieee80211_channel_flags {
	IEEE80211_CHAN_RADAR = 1<<3,		IEEE80211_CHAN_RADAR = 1<<3,
	IEEE80211_CHAN_NO_HT40PLUS = 1<<4,		IEEE80211_CHAN_NO_HT40PLUS = 1<<4,
	IEEE80211_CHAN_NO_HT40MINUS = 1<<5,		IEEE80211_CHAN_NO_HT40MINUS = 1<<5,
			IEEE80211_CHAN_NO_OFDM = 1<<6,
	};		};

	#define IEEE80211_CHAN_NO_HT40 \		#define IEEE80211_CHAN_NO_HT40 \

net/mac80211/mesh.c

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -622,6 +622,7 @@ void ieee80211_stop_mesh(struct ieee80211_sub_if_data *sdata)

	del_timer_sync(&sdata->u.mesh.housekeeping_timer);		del_timer_sync(&sdata->u.mesh.housekeeping_timer);
	del_timer_sync(&sdata->u.mesh.mesh_path_root_timer);		del_timer_sync(&sdata->u.mesh.mesh_path_root_timer);
			del_timer_sync(&sdata->u.mesh.mesh_path_timer);
	/*		/*
	* If the timer fired while we waited for it, it will have		* If the timer fired while we waited for it, it will have
	* requeued the work. Now the work will be running again		* requeued the work. Now the work will be running again
	@@ -634,6 +635,8 @@ void ieee80211_stop_mesh(struct ieee80211_sub_if_data *sdata)
	local->fif_other_bss--;		local->fif_other_bss--;
	atomic_dec(&local->iff_allmultis);		atomic_dec(&local->iff_allmultis);
	ieee80211_configure_filter(local);		ieee80211_configure_filter(local);

			sdata->u.mesh.timers_running = 0;
	}		}

	static void ieee80211_mesh_rx_bcn_presp(struct ieee80211_sub_if_data *sdata,		static void ieee80211_mesh_rx_bcn_presp(struct ieee80211_sub_if_data *sdata,

net/mac80211/mlme.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1430,6 +1430,8 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,
	del_timer_sync(&sdata->u.mgd.bcn_mon_timer);		del_timer_sync(&sdata->u.mgd.bcn_mon_timer);
	del_timer_sync(&sdata->u.mgd.timer);		del_timer_sync(&sdata->u.mgd.timer);
	del_timer_sync(&sdata->u.mgd.chswitch_timer);		del_timer_sync(&sdata->u.mgd.chswitch_timer);

			sdata->u.mgd.timers_running = 0;
	}		}

	void ieee80211_sta_rx_notify(struct ieee80211_sub_if_data *sdata,		void ieee80211_sta_rx_notify(struct ieee80211_sub_if_data *sdata,

net/mac80211/scan.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -299,7 +299,7 @@ static void __ieee80211_scan_completed(struct ieee80211_hw *hw, bool aborted,
	if (local->scan_req != local->int_scan_req)		if (local->scan_req != local->int_scan_req)
	cfg80211_scan_done(local->scan_req, aborted);		cfg80211_scan_done(local->scan_req, aborted);
	local->scan_req = NULL;		local->scan_req = NULL;
	local->scan_sdata = NULL;		rcu_assign_pointer(local->scan_sdata, NULL);

	local->scanning = 0;		local->scanning = 0;
	local->scan_channel = NULL;		local->scan_channel = NULL;
	@@ -984,7 +984,6 @@ int ieee80211_request_sched_scan_stop(struct ieee80211_sub_if_data *sdata)
	kfree(local->sched_scan_ies.ie[i]);		kfree(local->sched_scan_ies.ie[i]);

	drv_sched_scan_stop(local, sdata);		drv_sched_scan_stop(local, sdata);
	rcu_assign_pointer(local->sched_scan_sdata, NULL);
	}		}
	out:		out:
	mutex_unlock(&local->mtx);		mutex_unlock(&local->mtx);

net/wireless/reg.c

+18 −1

Original line number	Original line	Diff line number	Diff line
	@@ -680,6 +680,8 @@ static u32 map_regdom_flags(u32 rd_flags)
	channel_flags \|= IEEE80211_CHAN_NO_IBSS;		channel_flags \|= IEEE80211_CHAN_NO_IBSS;
	if (rd_flags & NL80211_RRF_DFS)		if (rd_flags & NL80211_RRF_DFS)
	channel_flags \|= IEEE80211_CHAN_RADAR;		channel_flags \|= IEEE80211_CHAN_RADAR;
			if (rd_flags & NL80211_RRF_NO_OFDM)
			channel_flags \|= IEEE80211_CHAN_NO_OFDM;
	return channel_flags;		return channel_flags;
	}		}

	@@ -901,7 +903,21 @@ static void handle_channel(struct wiphy *wiphy,
	chan->max_antenna_gain = min(chan->orig_mag,		chan->max_antenna_gain = min(chan->orig_mag,
	(int) MBI_TO_DBI(power_rule->max_antenna_gain));		(int) MBI_TO_DBI(power_rule->max_antenna_gain));
	chan->max_reg_power = (int) MBM_TO_DBM(power_rule->max_eirp);		chan->max_reg_power = (int) MBM_TO_DBM(power_rule->max_eirp);
	chan->max_power = min(chan->max_power, chan->max_reg_power);		if (chan->orig_mpwr) {
			/*
			* Devices that have their own custom regulatory domain
			* but also use WIPHY_FLAG_STRICT_REGULATORY will follow the
			* passed country IE power settings.
			*/
			if (initiator == NL80211_REGDOM_SET_BY_COUNTRY_IE &&
			wiphy->flags & WIPHY_FLAG_CUSTOM_REGULATORY &&
			wiphy->flags & WIPHY_FLAG_STRICT_REGULATORY)
			chan->max_power = chan->max_reg_power;
			else
			chan->max_power = min(chan->orig_mpwr,
			chan->max_reg_power);
			} else
			chan->max_power = chan->max_reg_power;
	}		}

	static void handle_band(struct wiphy *wiphy,		static void handle_band(struct wiphy *wiphy,
	@@ -1885,6 +1901,7 @@ static void restore_custom_reg_settings(struct wiphy *wiphy)
	chan->flags = chan->orig_flags;		chan->flags = chan->orig_flags;
	chan->max_antenna_gain = chan->orig_mag;		chan->max_antenna_gain = chan->orig_mag;
	chan->max_power = chan->orig_mpwr;		chan->max_power = chan->orig_mpwr;
			chan->beacon_found = false;
	}		}
	}		}
	}		}