diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2010-08-27 13:26:52 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-08-27 19:27:07 +0200 |
| commit | 3ffc2a905b1faae4c0fe39d66f0752c3a4cbb3c7 (patch) | |
| tree | d50902e1e171877e4fb034e36c837f16984ab9b4 /net/mac80211/key.h | |
| parent | cfg80211: allow vendor specific cipher suites (diff) | |
| download | linux-3ffc2a905b1faae4c0fe39d66f0752c3a4cbb3c7.tar.xz 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/key.h')
| -rw-r--r-- | net/mac80211/key.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/key.h b/net/mac80211/key.h index 53b5ce12536f..cb9a4a65cc68 100644 --- a/net/mac80211/key.h +++ b/net/mac80211/key.h @@ -130,9 +130,9 @@ struct ieee80211_key *ieee80211_key_alloc(u32 cipher, int idx, size_t key_len, * Insert a key into data structures (sdata, sta if necessary) * to make it used, free old key. */ -void ieee80211_key_link(struct ieee80211_key *key, - struct ieee80211_sub_if_data *sdata, - struct sta_info *sta); +int __must_check ieee80211_key_link(struct ieee80211_key *key, + struct ieee80211_sub_if_data *sdata, + struct sta_info *sta); void ieee80211_key_free(struct ieee80211_local *local, struct ieee80211_key *key); void ieee80211_set_default_key(struct ieee80211_sub_if_data *sdata, int idx); |