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

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

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

parents ef1b075c 2c316e69

drivers/net/wireless/ath/ath9k/htc_drv_main.c

+4 −1
Original line number Diff line number Diff line
@@ -95,8 +95,10 @@ static void ath9k_htc_vif_iter(void *data, u8 *mac, struct ieee80211_vif *vif) 


	if ((vif->type == NL80211_IFTYPE_AP ||

	     vif->type == NL80211_IFTYPE_MESH_POINT) &&

	    bss_conf->enable_beacon)

	    bss_conf->enable_beacon) {

		priv->reconfig_beacon = true;

		priv->rearm_ani = true;

	}



	if (bss_conf->assoc) {

		priv->rearm_ani = true;
@@ -257,6 +259,7 @@ static int ath9k_htc_set_channel(struct ath9k_htc_priv *priv, 


	ath9k_htc_ps_wakeup(priv);



	ath9k_htc_stop_ani(priv);

	del_timer_sync(&priv->tx.cleanup_timer);

	ath9k_htc_tx_drain(priv);

include/uapi/linux/nl80211.h

+3 −1
Original line number Diff line number Diff line
@@ -3911,6 +3911,8 @@ enum nl80211_ap_sme_features { 
 * @NL80211_FEATURE_CELL_BASE_REG_HINTS: This driver has been tested

 *	to work properly to suppport receiving regulatory hints from

 *	cellular base stations.

 * @NL80211_FEATURE_P2P_DEVICE_NEEDS_CHANNEL: (no longer available, only

 *	here to reserve the value for API/ABI compatibility)

 * @NL80211_FEATURE_SAE: This driver supports simultaneous authentication of

 *	equals (SAE) with user space SME (NL80211_CMD_AUTHENTICATE) in station

 *	mode
@@ -3955,7 +3957,7 @@ enum nl80211_feature_flags { 
	NL80211_FEATURE_HT_IBSS				= 1 << 1,

	NL80211_FEATURE_INACTIVITY_TIMER		= 1 << 2,

	NL80211_FEATURE_CELL_BASE_REG_HINTS		= 1 << 3,

	/* bit 4 is reserved - don't use */

	NL80211_FEATURE_P2P_DEVICE_NEEDS_CHANNEL	= 1 << 4,

	NL80211_FEATURE_SAE				= 1 << 5,

	NL80211_FEATURE_LOW_PRIORITY_SCAN		= 1 << 6,

	NL80211_FEATURE_SCAN_FLUSH			= 1 << 7,

net/bluetooth/l2cap_core.c

+2 −2
Original line number Diff line number Diff line
@@ -7519,9 +7519,9 @@ int __init l2cap_init(void) 
	l2cap_debugfs = debugfs_create_file("l2cap", 0444, bt_debugfs,

					    NULL, &l2cap_debugfs_fops);



	debugfs_create_u16("l2cap_le_max_credits", 0466, bt_debugfs,

	debugfs_create_u16("l2cap_le_max_credits", 0644, bt_debugfs,

			   &le_max_credits);

	debugfs_create_u16("l2cap_le_default_mps", 0466, bt_debugfs,

	debugfs_create_u16("l2cap_le_default_mps", 0644, bt_debugfs,

			   &le_default_mps);



	bt_6lowpan_init();

net/mac80211/ieee80211_i.h

+1 −0
Original line number Diff line number Diff line
@@ -317,6 +317,7 @@ struct ieee80211_roc_work { 


	bool started, abort, hw_begun, notified;

	bool to_be_freed;

	bool on_channel;



	unsigned long hw_start_time;

net/mac80211/mlme.c

+13 −7
Original line number Diff line number Diff line
@@ -3626,17 +3626,23 @@ void ieee80211_mgd_quiesce(struct ieee80211_sub_if_data *sdata) 


	sdata_lock(sdata);



	if (ifmgd->auth_data) {

	if (ifmgd->auth_data || ifmgd->assoc_data) {

		const u8 *bssid = ifmgd->auth_data ?

				ifmgd->auth_data->bss->bssid :

				ifmgd->assoc_data->bss->bssid;



		/*

		 * If we are trying to authenticate while suspending, cfg80211

		 * won't know and won't actually abort those attempts, thus we

		 * need to do that ourselves.

		 * If we are trying to authenticate / associate while suspending,

		 * cfg80211 won't know and won't actually abort those attempts,

		 * thus we need to do that ourselves.

		 */

		ieee80211_send_deauth_disassoc(sdata,

					       ifmgd->auth_data->bss->bssid,

		ieee80211_send_deauth_disassoc(sdata, bssid,

					       IEEE80211_STYPE_DEAUTH,

					       WLAN_REASON_DEAUTH_LEAVING,

					       false, frame_buf);

		if (ifmgd->assoc_data)

			ieee80211_destroy_assoc_data(sdata, false);

		if (ifmgd->auth_data)

			ieee80211_destroy_auth_data(sdata, false);

		cfg80211_tx_mlme_mgmt(sdata->dev, frame_buf,

				      IEEE80211_DEAUTH_FRAME_LEN);