Skip to content

Commit

Permalink
mac80211: Remove deprecated sta_notify commands
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Sujith authored and John W. Linville committed Jun 4, 2010
1 parent abd984e commit 38a6cc7
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 11 deletions.
6 changes: 1 addition & 5 deletions include/net/mac80211.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};

Expand Down
6 changes: 0 additions & 6 deletions net/mac80211/driver-ops.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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);
}
Expand Down

0 comments on commit 38a6cc7

Please sign in to comment.