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

Commit 38a6cc75 authored by Sujith's avatar Sujith Committed by John W. Linville
Browse files

mac80211: Remove deprecated sta_notify commands 



STA_NOTIFY_ADD and STA_NOTIFY_REMOVE have no users anymore,
and station addition/removal are indicated to drivers
using sta_add() and sta_remove(), which can sleep.

Signed-off-by: default avatarSujith <Sujith.Manoharan@atheros.com>
Acked-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent abd984e6

include/net/mac80211.h

+1 −5
Original line number Diff line number Diff line
@@ -879,16 +879,12 @@ struct ieee80211_sta { 
 * enum sta_notify_cmd - sta notify command

 *

 * Used with the sta_notify() callback in &struct ieee80211_ops, this

 * indicates addition and removal of a station to station table,

 * or if a associated station made a power state transition.

 * indicates if an associated station made a power state transition.

 *

 * @STA_NOTIFY_ADD: (DEPRECATED) a station was added to the station table

 * @STA_NOTIFY_REMOVE: (DEPRECATED) a station being removed from the station table

 * @STA_NOTIFY_SLEEP: a station is now sleeping

 * @STA_NOTIFY_AWAKE: a sleeping station woke up

 */

enum sta_notify_cmd {

	STA_NOTIFY_ADD, STA_NOTIFY_REMOVE,

	STA_NOTIFY_SLEEP, STA_NOTIFY_AWAKE,

};

net/mac80211/driver-ops.h

+0 −6
Original line number Diff line number Diff line
@@ -269,9 +269,6 @@ static inline int drv_sta_add(struct ieee80211_local *local, 


	if (local->ops->sta_add)

		ret = local->ops->sta_add(&local->hw, &sdata->vif, sta);

	else if (local->ops->sta_notify)

		local->ops->sta_notify(&local->hw, &sdata->vif,

					STA_NOTIFY_ADD, sta);



	trace_drv_sta_add(local, sdata, sta, ret);
@@ -286,9 +283,6 @@ static inline void drv_sta_remove(struct ieee80211_local *local, 


	if (local->ops->sta_remove)

		local->ops->sta_remove(&local->hw, &sdata->vif, sta);

	else if (local->ops->sta_notify)

		local->ops->sta_notify(&local->hw, &sdata->vif,

					STA_NOTIFY_REMOVE, sta);



	trace_drv_sta_remove(local, sdata, sta);

}