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

Commit 0d2164af authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mac80211-next-for-davem-2017-02-09' of... 

Merge tag 'mac80211-next-for-davem-2017-02-09' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next



Johannes Berg says:

====================
Some more updates:
 * use shash in mac80211 crypto code where applicable
 * some documentation fixes
 * pass RSSI levels up in change notifications
 * remove unused rfkill-regulator
 * various other cleanups
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1deeaa0b f181d6a3

drivers/net/wireless/intel/iwlwifi/mvm/rx.c

+2 −0
Original line number Diff line number Diff line
@@ -586,6 +586,7 @@ static void iwl_mvm_stat_iterator(void *_data, u8 *mac, 
		ieee80211_cqm_rssi_notify(

			vif,

			NL80211_CQM_RSSI_THRESHOLD_EVENT_LOW,

			sig,

			GFP_KERNEL);

	} else if (sig > thold &&

		   (last_event == 0 || sig > last_event + hyst)) {
@@ -595,6 +596,7 @@ static void iwl_mvm_stat_iterator(void *_data, u8 *mac, 
		ieee80211_cqm_rssi_notify(

			vif,

			NL80211_CQM_RSSI_THRESHOLD_EVENT_HIGH,

			sig,

			GFP_KERNEL);

	}

}

drivers/net/wireless/marvell/mwifiex/sta_event.c

+2 −2
Original line number Diff line number Diff line
@@ -824,7 +824,7 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv) 
	case EVENT_RSSI_LOW:

		cfg80211_cqm_rssi_notify(priv->netdev,

					 NL80211_CQM_RSSI_THRESHOLD_EVENT_LOW,

					 GFP_KERNEL);

					 0, GFP_KERNEL);

		mwifiex_send_cmd(priv, HostCmd_CMD_RSSI_INFO,

				 HostCmd_ACT_GEN_GET, 0, NULL, false);

		priv->subsc_evt_rssi_state = RSSI_LOW_RECVD;
@@ -839,7 +839,7 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv) 
	case EVENT_RSSI_HIGH:

		cfg80211_cqm_rssi_notify(priv->netdev,

					 NL80211_CQM_RSSI_THRESHOLD_EVENT_HIGH,

					 GFP_KERNEL);

					 0, GFP_KERNEL);

		mwifiex_send_cmd(priv, HostCmd_CMD_RSSI_INFO,

				 HostCmd_ACT_GEN_GET, 0, NULL, false);

		priv->subsc_evt_rssi_state = RSSI_HIGH_RECVD;

drivers/net/wireless/rndis_wlan.c

+1 −1
Original line number Diff line number Diff line
@@ -3187,7 +3187,7 @@ static void rndis_do_cqm(struct usbnet *usbdev, s32 rssi) 
		return;



	priv->last_cqm_event_rssi = rssi;

	cfg80211_cqm_rssi_notify(usbdev->net, event, GFP_KERNEL);

	cfg80211_cqm_rssi_notify(usbdev->net, event, rssi, GFP_KERNEL);

}



#define DEVICE_POLLER_JIFFIES (HZ)

drivers/net/wireless/rsi/rsi_91x_mac80211.c

+1 −1
Original line number Diff line number Diff line
@@ -877,7 +877,7 @@ static void rsi_perform_cqm(struct rsi_common *common, 


	common->cqm_info.last_cqm_event_rssi = rssi;

	rsi_dbg(INFO_ZONE, "CQM: Notifying event: %d\n", event);

	ieee80211_cqm_rssi_notify(adapter->vifs[0], event, GFP_KERNEL);

	ieee80211_cqm_rssi_notify(adapter->vifs[0], event, rssi, GFP_KERNEL);



	return;

}

drivers/net/wireless/st/cw1200/sta.c

+1 −1
Original line number Diff line number Diff line
@@ -1019,7 +1019,7 @@ void cw1200_event_handler(struct work_struct *work) 
				NL80211_CQM_RSSI_THRESHOLD_EVENT_LOW :

				NL80211_CQM_RSSI_THRESHOLD_EVENT_HIGH;

			pr_debug("[CQM] RSSI event: %d.\n", rcpi_rssi);

			ieee80211_cqm_rssi_notify(priv->vif, cqm_evt,

			ieee80211_cqm_rssi_notify(priv->vif, cqm_evt, rcpi_rssi,

						  GFP_KERNEL);

			break;

		}