diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-07-13 14:01:44 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 15:01:41 -0400 |
commit | 0604384d4ba4cebb4e1c81a8b2c61958f49e31fe (patch) | |
tree | cb524c2be1e503513fe74ee5444d13fcdb630b62 /drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c | |
parent | f5ce8fe1fd256bc7f32d13aba83145e559a76942 (diff) |
Staging: rtl8187se: rename struct ieee80211_hdr to struct ieee80211_hdr_4addr
ieee80211_hdr name is too generic so use ieee80211_hdr_4addr one instead
(which matches the naming used by rtl8192su driver).
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c')
-rw-r--r-- | drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c index 72056d7db31..172e8f3ae6c 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_crypt_ccmp.c | |||
@@ -114,7 +114,7 @@ static inline void xor_block(u8 *b, u8 *a, size_t len) | |||
114 | } | 114 | } |
115 | 115 | ||
116 | static void ccmp_init_blocks(struct crypto_tfm *tfm, | 116 | static void ccmp_init_blocks(struct crypto_tfm *tfm, |
117 | struct ieee80211_hdr *hdr, | 117 | struct ieee80211_hdr_4addr *hdr, |
118 | u8 *pn, size_t dlen, u8 *b0, u8 *auth, | 118 | u8 *pn, size_t dlen, u8 *b0, u8 *auth, |
119 | u8 *s0) | 119 | u8 *s0) |
120 | { | 120 | { |
@@ -196,7 +196,7 @@ static int ieee80211_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv) | |||
196 | struct ieee80211_ccmp_data *key = priv; | 196 | struct ieee80211_ccmp_data *key = priv; |
197 | int data_len, i; | 197 | int data_len, i; |
198 | u8 *pos; | 198 | u8 *pos; |
199 | struct ieee80211_hdr *hdr; | 199 | struct ieee80211_hdr_4addr *hdr; |
200 | int blocks, last, len; | 200 | int blocks, last, len; |
201 | u8 *mic; | 201 | u8 *mic; |
202 | u8 *b0 = key->tx_b0; | 202 | u8 *b0 = key->tx_b0; |
@@ -232,7 +232,7 @@ static int ieee80211_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv) | |||
232 | *pos++ = key->tx_pn[1]; | 232 | *pos++ = key->tx_pn[1]; |
233 | *pos++ = key->tx_pn[0]; | 233 | *pos++ = key->tx_pn[0]; |
234 | 234 | ||
235 | hdr = (struct ieee80211_hdr *) skb->data; | 235 | hdr = (struct ieee80211_hdr_4addr *)skb->data; |
236 | //mic is moved to here by john | 236 | //mic is moved to here by john |
237 | mic = skb_put(skb, CCMP_MIC_LEN); | 237 | mic = skb_put(skb, CCMP_MIC_LEN); |
238 | 238 | ||
@@ -265,7 +265,7 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv) | |||
265 | { | 265 | { |
266 | struct ieee80211_ccmp_data *key = priv; | 266 | struct ieee80211_ccmp_data *key = priv; |
267 | u8 keyidx, *pos; | 267 | u8 keyidx, *pos; |
268 | struct ieee80211_hdr *hdr; | 268 | struct ieee80211_hdr_4addr *hdr; |
269 | u8 pn[6]; | 269 | u8 pn[6]; |
270 | size_t data_len = skb->len - hdr_len - CCMP_HDR_LEN - CCMP_MIC_LEN; | 270 | size_t data_len = skb->len - hdr_len - CCMP_HDR_LEN - CCMP_MIC_LEN; |
271 | u8 *mic = skb->data + skb->len - CCMP_MIC_LEN; | 271 | u8 *mic = skb->data + skb->len - CCMP_MIC_LEN; |
@@ -279,7 +279,7 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv) | |||
279 | return -1; | 279 | return -1; |
280 | } | 280 | } |
281 | 281 | ||
282 | hdr = (struct ieee80211_hdr *) skb->data; | 282 | hdr = (struct ieee80211_hdr_4addr *)skb->data; |
283 | pos = skb->data + hdr_len; | 283 | pos = skb->data + hdr_len; |
284 | keyidx = pos[3]; | 284 | keyidx = pos[3]; |
285 | if (!(keyidx & (1 << 5))) { | 285 | if (!(keyidx & (1 << 5))) { |