diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-07-07 15:07:49 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-07-08 16:35:50 -0400 |
| commit | 3473187d2459a078e00e5fac8aafc30af69c57fa (patch) | |
| tree | 93c3da6dbcbfd09ea81884bee790219d4cee0d56 /net/mac80211/tkip.h | |
| parent | 73e194639d90594d06d0c10019c0ab4638869135 (diff) | |
| download | blackbird-op-linux-3473187d2459a078e00e5fac8aafc30af69c57fa.tar.gz blackbird-op-linux-3473187d2459a078e00e5fac8aafc30af69c57fa.zip | |
mac80211: remove wep dependency
The current mac80211 code assumes that WEP is always available. If WEP
fails to initialize, ieee80211_register_hw will always fail.
In some cases (e.g. FIPS certification), the cryptography used by WEP is
unavailable. However, in such cases there is no good reason why CCMP
encryption (or even no link level encryption) cannot be used. So, this
patch removes mac80211's assumption that WEP (and TKIP) will always be
available for use.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/tkip.h')
| -rw-r--r-- | net/mac80211/tkip.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/tkip.h b/net/mac80211/tkip.h index d4714383f5fc..7e83dee976fa 100644 --- a/net/mac80211/tkip.h +++ b/net/mac80211/tkip.h @@ -15,7 +15,7 @@ u8 *ieee80211_tkip_add_iv(u8 *pos, struct ieee80211_key *key, u16 iv16); -void ieee80211_tkip_encrypt_data(struct crypto_blkcipher *tfm, +int ieee80211_tkip_encrypt_data(struct crypto_blkcipher *tfm, struct ieee80211_key *key, u8 *pos, size_t payload_len, u8 *ta); enum { |
