diff options
Diffstat (limited to 'net/mac80211/sta_info.c')
-rw-r--r-- | net/mac80211/sta_info.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index fba2d79e4d2b..c17172abb21c 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c | |||
@@ -19,7 +19,6 @@ | |||
19 | #include "ieee80211_i.h" | 19 | #include "ieee80211_i.h" |
20 | #include "ieee80211_rate.h" | 20 | #include "ieee80211_rate.h" |
21 | #include "sta_info.h" | 21 | #include "sta_info.h" |
22 | #include "debugfs_key.h" | ||
23 | #include "debugfs_sta.h" | 22 | #include "debugfs_sta.h" |
24 | 23 | ||
25 | /* Caller must hold local->sta_lock */ | 24 | /* Caller must hold local->sta_lock */ |
@@ -118,8 +117,6 @@ static void sta_info_release(struct kref *kref) | |||
118 | } | 117 | } |
119 | rate_control_free_sta(sta->rate_ctrl, sta->rate_ctrl_priv); | 118 | rate_control_free_sta(sta->rate_ctrl, sta->rate_ctrl_priv); |
120 | rate_control_put(sta->rate_ctrl); | 119 | rate_control_put(sta->rate_ctrl); |
121 | if (sta->key) | ||
122 | ieee80211_debugfs_key_sta_del(sta->key, sta); | ||
123 | kfree(sta); | 120 | kfree(sta); |
124 | } | 121 | } |
125 | 122 | ||
@@ -230,11 +227,8 @@ void sta_info_free(struct sta_info *sta) | |||
230 | local->mdev->name, MAC_ARG(sta->addr)); | 227 | local->mdev->name, MAC_ARG(sta->addr)); |
231 | #endif /* CONFIG_MAC80211_VERBOSE_DEBUG */ | 228 | #endif /* CONFIG_MAC80211_VERBOSE_DEBUG */ |
232 | 229 | ||
233 | if (sta->key) { | 230 | ieee80211_key_free(sta->key); |
234 | ieee80211_debugfs_key_remove(sta->key); | 231 | sta->key = NULL; |
235 | ieee80211_key_free(sta->key); | ||
236 | sta->key = NULL; | ||
237 | } | ||
238 | 232 | ||
239 | rate_control_remove_sta_debugfs(sta); | 233 | rate_control_remove_sta_debugfs(sta); |
240 | ieee80211_sta_debugfs_remove(sta); | 234 | ieee80211_sta_debugfs_remove(sta); |