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/wpa.c | |
| parent | 73e194639d90594d06d0c10019c0ab4638869135 (diff) | |
| download | kernel_samsung_smdk4412-3473187d2459a078e00e5fac8aafc30af69c57fa.zip kernel_samsung_smdk4412-3473187d2459a078e00e5fac8aafc30af69c57fa.tar.gz kernel_samsung_smdk4412-3473187d2459a078e00e5fac8aafc30af69c57fa.tar.bz2 | |
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/wpa.c')
| -rw-r--r-- | net/mac80211/wpa.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/mac80211/wpa.c b/net/mac80211/wpa.c index a14e677..8d59d27 100644 --- a/net/mac80211/wpa.c +++ b/net/mac80211/wpa.c @@ -183,9 +183,8 @@ static int tkip_encrypt_skb(struct ieee80211_tx_data *tx, struct sk_buff *skb) skb_put(skb, TKIP_ICV_LEN); hdr = (struct ieee80211_hdr *) skb->data; - ieee80211_tkip_encrypt_data(tx->local->wep_tx_tfm, - key, pos, len, hdr->addr2); - return 0; + return ieee80211_tkip_encrypt_data(tx->local->wep_tx_tfm, + key, pos, len, hdr->addr2); } |