aboutsummaryrefslogtreecommitdiffstats
path: root/net/ieee80211/ieee80211_crypt_wep.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ieee80211/ieee80211_crypt_wep.c')
-rw-r--r--net/ieee80211/ieee80211_crypt_wep.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ieee80211/ieee80211_crypt_wep.c b/net/ieee80211/ieee80211_crypt_wep.c
index 7a95c3d81314..ec6d8851a061 100644
--- a/net/ieee80211/ieee80211_crypt_wep.c
+++ b/net/ieee80211/ieee80211_crypt_wep.c
@@ -97,7 +97,7 @@ static int prism2_wep_build_iv(struct sk_buff *skb, int hdr_len,
97 struct prism2_wep_data *wep = priv; 97 struct prism2_wep_data *wep = priv;
98 u32 klen, len; 98 u32 klen, len;
99 u8 *pos; 99 u8 *pos;
100 100
101 if (skb_headroom(skb) < 4 || skb->len < hdr_len) 101 if (skb_headroom(skb) < 4 || skb->len < hdr_len)
102 return -1; 102 return -1;
103 103
@@ -146,17 +146,17 @@ static int prism2_wep_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
146 /* other checks are in prism2_wep_build_iv */ 146 /* other checks are in prism2_wep_build_iv */
147 if (skb_tailroom(skb) < 4) 147 if (skb_tailroom(skb) < 4)
148 return -1; 148 return -1;
149 149
150 /* add the IV to the frame */ 150 /* add the IV to the frame */
151 if (prism2_wep_build_iv(skb, hdr_len, NULL, 0, priv)) 151 if (prism2_wep_build_iv(skb, hdr_len, NULL, 0, priv))
152 return -1; 152 return -1;
153 153
154 /* Copy the IV into the first 3 bytes of the key */ 154 /* Copy the IV into the first 3 bytes of the key */
155 memcpy(key, skb->data + hdr_len, 3); 155 memcpy(key, skb->data + hdr_len, 3);
156 156
157 /* Copy rest of the WEP key (the secret part) */ 157 /* Copy rest of the WEP key (the secret part) */
158 memcpy(key + 3, wep->key, wep->key_len); 158 memcpy(key + 3, wep->key, wep->key_len);
159 159
160 len = skb->len - hdr_len - 4; 160 len = skb->len - hdr_len - 4;
161 pos = skb->data + hdr_len + 4; 161 pos = skb->data + hdr_len + 4;
162 klen = 3 + wep->key_len; 162 klen = 3 + wep->key_len;