diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/mac80211/ieee80211_sta.c | 2 | ||||
-rw-r--r-- | net/mac80211/sta_info.c | 2 | ||||
-rw-r--r-- | net/mac80211/sta_info.h | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c index b836948a0b40..152682d4bb1a 100644 --- a/net/mac80211/ieee80211_sta.c +++ b/net/mac80211/ieee80211_sta.c | |||
@@ -3079,7 +3079,7 @@ static void ieee80211_sta_expire(struct net_device *dev, unsigned long exp_time) | |||
3079 | if (time_after(jiffies, sta->last_rx + exp_time)) { | 3079 | if (time_after(jiffies, sta->last_rx + exp_time)) { |
3080 | printk(KERN_DEBUG "%s: expiring inactive STA %s\n", | 3080 | printk(KERN_DEBUG "%s: expiring inactive STA %s\n", |
3081 | dev->name, print_mac(mac, sta->addr)); | 3081 | dev->name, print_mac(mac, sta->addr)); |
3082 | sta_info_unlink(&sta); | 3082 | __sta_info_unlink(&sta); |
3083 | if (sta) | 3083 | if (sta) |
3084 | list_add(&sta->list, &tmp_list); | 3084 | list_add(&sta->list, &tmp_list); |
3085 | } | 3085 | } |
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index f5c65e891288..7e1e87257647 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c | |||
@@ -454,7 +454,7 @@ static struct sta_info *__sta_info_unpin(struct sta_info *sta) | |||
454 | return ret; | 454 | return ret; |
455 | } | 455 | } |
456 | 456 | ||
457 | static void __sta_info_unlink(struct sta_info **sta) | 457 | void __sta_info_unlink(struct sta_info **sta) |
458 | { | 458 | { |
459 | struct ieee80211_local *local = (*sta)->local; | 459 | struct ieee80211_local *local = (*sta)->local; |
460 | struct ieee80211_sub_if_data *sdata = (*sta)->sdata; | 460 | struct ieee80211_sub_if_data *sdata = (*sta)->sdata; |
diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h index b09861eb124e..ebb7b2b4d0b9 100644 --- a/net/mac80211/sta_info.h +++ b/net/mac80211/sta_info.h | |||
@@ -347,6 +347,7 @@ int sta_info_insert(struct sta_info *sta); | |||
347 | * has already unlinked it. | 347 | * has already unlinked it. |
348 | */ | 348 | */ |
349 | void sta_info_unlink(struct sta_info **sta); | 349 | void sta_info_unlink(struct sta_info **sta); |
350 | void __sta_info_unlink(struct sta_info **sta); | ||
350 | 351 | ||
351 | void sta_info_destroy(struct sta_info *sta); | 352 | void sta_info_destroy(struct sta_info *sta); |
352 | void sta_info_set_tim_bit(struct sta_info *sta); | 353 | void sta_info_set_tim_bit(struct sta_info *sta); |