diff options
Diffstat (limited to 'net/ieee80211/ieee80211_rx.c')
-rw-r--r-- | net/ieee80211/ieee80211_rx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c index 3dd58b594f6a..9c67dfae4320 100644 --- a/net/ieee80211/ieee80211_rx.c +++ b/net/ieee80211/ieee80211_rx.c | |||
@@ -268,7 +268,7 @@ static int ieee80211_is_eapol_frame(struct ieee80211_device *ieee, | |||
268 | /* Called only as a tasklet (software IRQ), by ieee80211_rx */ | 268 | /* Called only as a tasklet (software IRQ), by ieee80211_rx */ |
269 | static int | 269 | static int |
270 | ieee80211_rx_frame_decrypt(struct ieee80211_device *ieee, struct sk_buff *skb, | 270 | ieee80211_rx_frame_decrypt(struct ieee80211_device *ieee, struct sk_buff *skb, |
271 | struct ieee80211_crypt_data *crypt) | 271 | struct lib80211_crypt_data *crypt) |
272 | { | 272 | { |
273 | struct ieee80211_hdr_3addr *hdr; | 273 | struct ieee80211_hdr_3addr *hdr; |
274 | int res, hdrlen; | 274 | int res, hdrlen; |
@@ -300,7 +300,7 @@ ieee80211_rx_frame_decrypt(struct ieee80211_device *ieee, struct sk_buff *skb, | |||
300 | static int | 300 | static int |
301 | ieee80211_rx_frame_decrypt_msdu(struct ieee80211_device *ieee, | 301 | ieee80211_rx_frame_decrypt_msdu(struct ieee80211_device *ieee, |
302 | struct sk_buff *skb, int keyidx, | 302 | struct sk_buff *skb, int keyidx, |
303 | struct ieee80211_crypt_data *crypt) | 303 | struct lib80211_crypt_data *crypt) |
304 | { | 304 | { |
305 | struct ieee80211_hdr_3addr *hdr; | 305 | struct ieee80211_hdr_3addr *hdr; |
306 | int res, hdrlen; | 306 | int res, hdrlen; |
@@ -348,7 +348,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, | |||
348 | #endif | 348 | #endif |
349 | u8 dst[ETH_ALEN]; | 349 | u8 dst[ETH_ALEN]; |
350 | u8 src[ETH_ALEN]; | 350 | u8 src[ETH_ALEN]; |
351 | struct ieee80211_crypt_data *crypt = NULL; | 351 | struct lib80211_crypt_data *crypt = NULL; |
352 | int keyidx = 0; | 352 | int keyidx = 0; |
353 | int can_be_decrypted = 0; | 353 | int can_be_decrypted = 0; |
354 | 354 | ||
@@ -431,7 +431,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, | |||
431 | * is only allowed 2-bits of storage, no value of keyidx can | 431 | * is only allowed 2-bits of storage, no value of keyidx can |
432 | * be provided via above code that would result in keyidx | 432 | * be provided via above code that would result in keyidx |
433 | * being out of range */ | 433 | * being out of range */ |
434 | crypt = ieee->crypt[keyidx]; | 434 | crypt = ieee->crypt_info.crypt[keyidx]; |
435 | 435 | ||
436 | #ifdef NOT_YET | 436 | #ifdef NOT_YET |
437 | sta = NULL; | 437 | sta = NULL; |