diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-03-06 22:53:52 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-03-11 15:16:41 +0200 |
| commit | 79cf2dfa362f3e6368ad8ecb10aa82b39678fedc (patch) | |
| tree | a31ef2bc191d189378fc3520df7e8d303b65c0d1 /net/mac80211/cfg.c | |
| parent | 3d5839b6aa6bbf26c04e885956109d1995d01fe2 (diff) | |
| download | linux-79cf2dfa362f3e6368ad8ecb10aa82b39678fedc.tar.bz2 | |
mac80211: clean up key freeing a bit
When a key is allocated but not really added, there's no
need to go through the entire teardown process. Also, if
adding a key fails, ieee80211_key_link() can take care of
freeing it instead of the (only) caller.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/cfg.c')
| -rw-r--r-- | net/mac80211/cfg.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 61fc9116380d..c2d4bf24a8c2 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -175,7 +175,7 @@ static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev, * add it to the device after the station. */ if (!sta || !test_sta_flag(sta, WLAN_STA_ASSOC)) { - ieee80211_key_free(sdata->local, key); + ieee80211_key_free_unused(key); err = -ENOENT; goto out_unlock; } @@ -214,8 +214,6 @@ static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev, } err = ieee80211_key_link(key, sdata, sta); - if (err) - ieee80211_key_free(sdata->local, key); out_unlock: mutex_unlock(&sdata->local->sta_mtx); |