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

Commit bee427b8 authored by Andrzej Zaborowski's avatar Andrzej Zaborowski Committed by Johannes Berg
Browse files

cfg80211: Pass new RSSI level in CQM RSSI notification 



Update the drivers to pass the RSSI level as a cfg80211_cqm_rssi_notify
parameter and pass this value to userspace in a new nl80211 attribute.
This helps both userspace and also helps in the implementation of the
multiple RSSI thresholds CQM mechanism.

Note for marvell/mwifiex I pass 0 for the RSSI value because the new
RSSI value is not available to the driver at the time of the
cfg80211_cqm_rssi_notify call, but the driver queries the new value
immediately after that, so it is actually available just a moment later
if we wanted to defer caling cfg80211_cqm_rssi_notify until that moment.
Without this, the new cfg80211 code (patch 3) will call .get_station
which will send a duplicate HostCmd_CMD_RSSI_INFO command to the hardware.

Signed-off-by: default avatarAndrew Zaborowski <andrew.zaborowski@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 769f07d8

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)

include/net/cfg80211.h

+2 −1
Original line number Diff line number Diff line
@@ -5390,6 +5390,7 @@ void cfg80211_mgmt_tx_status(struct wireless_dev *wdev, u64 cookie, 
 * cfg80211_cqm_rssi_notify - connection quality monitoring rssi event

 * @dev: network device

 * @rssi_event: the triggered RSSI event

 * @rssi_level: new RSSI level value or 0 if not available

 * @gfp: context flags

 *

 * This function is called when a configured connection quality monitoring
@@ -5397,7 +5398,7 @@ void cfg80211_mgmt_tx_status(struct wireless_dev *wdev, u64 cookie, 
 */

void cfg80211_cqm_rssi_notify(struct net_device *dev,

			      enum nl80211_cqm_rssi_threshold_event rssi_event,

			      gfp_t gfp);

			      s32 rssi_level, gfp_t gfp);



/**

 * cfg80211_cqm_pktloss_notify - notify userspace about packetloss to peer

include/uapi/linux/nl80211.h

+3 −0
Original line number Diff line number Diff line
@@ -3952,6 +3952,8 @@ enum nl80211_ps_state { 
 *	%NL80211_CMD_NOTIFY_CQM. Set to 0 to turn off TX error reporting.

 * @NL80211_ATTR_CQM_BEACON_LOSS_EVENT: flag attribute that's set in a beacon

 *	loss event

 * @NL80211_ATTR_CQM_RSSI_LEVEL: the RSSI value in dBm that triggered the

 *	RSSI threshold event.

 * @__NL80211_ATTR_CQM_AFTER_LAST: internal

 * @NL80211_ATTR_CQM_MAX: highest key attribute

 */
@@ -3965,6 +3967,7 @@ enum nl80211_attr_cqm { 
	NL80211_ATTR_CQM_TXE_PKTS,

	NL80211_ATTR_CQM_TXE_INTVL,

	NL80211_ATTR_CQM_BEACON_LOSS_EVENT,

	NL80211_ATTR_CQM_RSSI_LEVEL,



	/* keep last */

	__NL80211_ATTR_CQM_AFTER_LAST,

net/mac80211/mlme.c

+1 −1
Original line number Diff line number Diff line
@@ -5048,7 +5048,7 @@ void ieee80211_cqm_rssi_notify(struct ieee80211_vif *vif, 


	trace_api_cqm_rssi_notify(sdata, rssi_event, rssi_level);



	cfg80211_cqm_rssi_notify(sdata->dev, rssi_event, gfp);

	cfg80211_cqm_rssi_notify(sdata->dev, rssi_event, rssi_level, gfp);

}

EXPORT_SYMBOL(ieee80211_cqm_rssi_notify);