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

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

mac80211: Pass new RSSI level in CQM RSSI notification 



Extend ieee80211_cqm_rssi_notify with a rssi_level parameter so that
this information can be passed to netlink clients in the next patch, if
available.  Most drivers will have this value at hand.  wl1251 receives
events from the firmware that only tell it whether latest measurement
is above or below threshold so we don't pass any value at this time
(parameter is 0).

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

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

+2 −0
Original line number Diff line number Diff line
@@ -571,6 +571,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)) {
@@ -580,6 +581,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/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;

		}

drivers/net/wireless/ti/wl1251/event.c

+2 −2
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ static int wl1251_event_process(struct wl1251 *wl, struct event_mailbox *mbox) 
				     "ROAMING_TRIGGER_LOW_RSSI_EVENT");

			ieee80211_cqm_rssi_notify(wl->vif,

				NL80211_CQM_RSSI_THRESHOLD_EVENT_LOW,

				GFP_KERNEL);

				0, GFP_KERNEL);

		}



		if (vector & ROAMING_TRIGGER_REGAINED_RSSI_EVENT_ID) {
@@ -158,7 +158,7 @@ static int wl1251_event_process(struct wl1251 *wl, struct event_mailbox *mbox) 
				     "ROAMING_TRIGGER_REGAINED_RSSI_EVENT");

			ieee80211_cqm_rssi_notify(wl->vif,

				NL80211_CQM_RSSI_THRESHOLD_EVENT_HIGH,

				GFP_KERNEL);

				0, GFP_KERNEL);

		}

	}

drivers/net/wireless/ti/wlcore/event.c

+2 −1
Original line number Diff line number Diff line
@@ -129,7 +129,8 @@ void wlcore_event_rssi_trigger(struct wl1271 *wl, s8 *metric_arr) 


		vif = wl12xx_wlvif_to_vif(wlvif);

		if (event != wlvif->last_rssi_event)

			ieee80211_cqm_rssi_notify(vif, event, GFP_KERNEL);

			ieee80211_cqm_rssi_notify(vif, event, metric,

						  GFP_KERNEL);

		wlvif->last_rssi_event = event;

	}

}