Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-10-31 17:21:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

mac80211: Remove deprecated sta_notify commands

Browse Source 
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: Sujith <Sujith.Manoharan@atheros.com>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Sujith 2010-05-19 11:32:30 +05:30 committed by John W. Linville
parent abd984e611
commit 38a6cc7538
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/net/mac80211.h
View File

@ -879,16 +879,12 @@ struct ieee80211_sta {
* enum sta_notify_cmd - sta notify command * enum sta_notify_cmd - sta notify command
* *
* Used with the sta_notify() callback in &struct ieee80211_ops, this * Used with the sta_notify() callback in &struct ieee80211_ops, this
* indicates addition and removal of a station to station table, * indicates if an associated station made a power state transition.
* or if a 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_SLEEP: a station is now sleeping
* @STA_NOTIFY_AWAKE: a sleeping station woke up * @STA_NOTIFY_AWAKE: a sleeping station woke up
*/ */
enum sta_notify_cmd { enum sta_notify_cmd {
STA_NOTIFY_ADD, STA_NOTIFY_REMOVE,
STA_NOTIFY_SLEEP, STA_NOTIFY_AWAKE, STA_NOTIFY_SLEEP, STA_NOTIFY_AWAKE,
}; };

6
net/mac80211/driver-ops.h
View File

@ -269,9 +269,6 @@ static inline int drv_sta_add(struct ieee80211_local *local,
if (local->ops->sta_add) if (local->ops->sta_add)
ret = local->ops->sta_add(&local->hw, &sdata->vif, sta); 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); 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) if (local->ops->sta_remove)
local->ops->sta_remove(&local->hw, &sdata->vif, sta); 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); trace_drv_sta_remove(local, sdata, sta);
} }