diff options
| author | Johannes Berg | 2010-08-27 13:26:52 +0200 |
|---|---|---|
| committer | John W. Linville | 2010-08-27 19:27:07 +0200 |
| commit | 3ffc2a905b1faae4c0fe39d66f0752c3a4cbb3c7 (patch) | |
| tree | d50902e1e171877e4fb034e36c837f16984ab9b4 /net/mac80211/cfg.c | |
| parent | cfg80211: allow vendor specific cipher suites (diff) | |
| download | kernel-qcow2-linux-3ffc2a905b1faae4c0fe39d66f0752c3a4cbb3c7.tar.gz kernel-qcow2-linux-3ffc2a905b1faae4c0fe39d66f0752c3a4cbb3c7.tar.xz kernel-qcow2-linux-3ffc2a905b1faae4c0fe39d66f0752c3a4cbb3c7.zip | |
mac80211: allow vendor specific cipher suites
Allow drivers to specify their own set of cipher
suites to advertise vendor-specific ciphers. The
driver is then required to implement hardware
crypto offload for it.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/cfg.c')
| -rw-r--r-- | net/mac80211/cfg.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 581438255d7e..f149b4eb28d9 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -119,9 +119,10 @@ static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev, } } - ieee80211_key_link(key, sdata, sta); + err = ieee80211_key_link(key, sdata, sta); + if (err) + ieee80211_key_free(sdata->local, key); - err = 0; out_unlock: mutex_unlock(&sdata->local->sta_mtx); |