diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2007-12-18 15:27:47 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 14:59:53 -0800 |
| commit | 176e4f84423af3105894a7d71b23c1a16678a6be (patch) | |
| tree | 7f5103c2ca716bd2ab2bbdb68ae024d189d5c9d7 /net/mac80211/wep.c | |
| parent | 7bbdd2d987971f9d123a2db89ed921bf02e34f9a (diff) | |
| download | linux-176e4f84423af3105894a7d71b23c1a16678a6be.tar.gz linux-176e4f84423af3105894a7d71b23c1a16678a6be.tar.bz2 linux-176e4f84423af3105894a7d71b23c1a16678a6be.zip | |
mac80211: move tx crypto decision
This patch moves the decision making about whether a frame is encrypted
with a certain algorithm up into the TX handlers rather than having it
in the crypto algorithm implementation.
This fixes a problem with the radiotap injection code where injecting
a non-data packet and requesting encryption could end up asking the
driver to encrypt a packet without giving it a key.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/wep.c')
| -rw-r--r-- | net/mac80211/wep.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/net/mac80211/wep.c b/net/mac80211/wep.c index b5f3413403bd..a0cff72a580b 100644 --- a/net/mac80211/wep.c +++ b/net/mac80211/wep.c @@ -349,16 +349,6 @@ static int wep_encrypt_skb(struct ieee80211_txrx_data *tx, struct sk_buff *skb) ieee80211_txrx_result ieee80211_crypto_wep_encrypt(struct ieee80211_txrx_data *tx) { - struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) tx->skb->data; - u16 fc; - - fc = le16_to_cpu(hdr->frame_control); - - if (((fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA && - ((fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_MGMT || - (fc & IEEE80211_FCTL_STYPE) != IEEE80211_STYPE_AUTH))) - return TXRX_CONTINUE; - tx->u.tx.control->iv_len = WEP_IV_LEN; tx->u.tx.control->icv_len = WEP_ICV_LEN; ieee80211_tx_set_iswep(tx); |