|
@@ -573,37 +573,12 @@ static inline void drv_sta_pre_rcu_remove(struct ieee80211_local *local,
|
|
|
trace_drv_return_void(local);
|
|
|
}
|
|
|
|
|
|
-static inline __must_check
|
|
|
+__must_check
|
|
|
int drv_sta_state(struct ieee80211_local *local,
|
|
|
struct ieee80211_sub_if_data *sdata,
|
|
|
struct sta_info *sta,
|
|
|
enum ieee80211_sta_state old_state,
|
|
|
- enum ieee80211_sta_state new_state)
|
|
|
-{
|
|
|
- int ret = 0;
|
|
|
-
|
|
|
- might_sleep();
|
|
|
-
|
|
|
- sdata = get_bss_sdata(sdata);
|
|
|
- if (!check_sdata_in_driver(sdata))
|
|
|
- return -EIO;
|
|
|
-
|
|
|
- trace_drv_sta_state(local, sdata, &sta->sta, old_state, new_state);
|
|
|
- if (local->ops->sta_state) {
|
|
|
- ret = local->ops->sta_state(&local->hw, &sdata->vif, &sta->sta,
|
|
|
- old_state, new_state);
|
|
|
- } else if (old_state == IEEE80211_STA_AUTH &&
|
|
|
- new_state == IEEE80211_STA_ASSOC) {
|
|
|
- ret = drv_sta_add(local, sdata, &sta->sta);
|
|
|
- if (ret == 0)
|
|
|
- sta->uploaded = true;
|
|
|
- } else if (old_state == IEEE80211_STA_ASSOC &&
|
|
|
- new_state == IEEE80211_STA_AUTH) {
|
|
|
- drv_sta_remove(local, sdata, &sta->sta);
|
|
|
- }
|
|
|
- trace_drv_return_int(local, ret);
|
|
|
- return ret;
|
|
|
-}
|
|
|
+ enum ieee80211_sta_state new_state);
|
|
|
|
|
|
static inline void drv_sta_rc_update(struct ieee80211_local *local,
|
|
|
struct ieee80211_sub_if_data *sdata,
|