diff options
Diffstat (limited to 'net/ieee80211/ieee80211_tx.c')
-rw-r--r-- | net/ieee80211/ieee80211_tx.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/ieee80211/ieee80211_tx.c b/net/ieee80211/ieee80211_tx.c index d996547f7a62..f78f57e8844a 100644 --- a/net/ieee80211/ieee80211_tx.c +++ b/net/ieee80211/ieee80211_tx.c | |||
@@ -152,7 +152,8 @@ static int ieee80211_copy_snap(u8 * data, __be16 h_proto) | |||
152 | static int ieee80211_encrypt_fragment(struct ieee80211_device *ieee, | 152 | static int ieee80211_encrypt_fragment(struct ieee80211_device *ieee, |
153 | struct sk_buff *frag, int hdr_len) | 153 | struct sk_buff *frag, int hdr_len) |
154 | { | 154 | { |
155 | struct ieee80211_crypt_data *crypt = ieee->crypt[ieee->tx_keyidx]; | 155 | struct lib80211_crypt_data *crypt = |
156 | ieee->crypt_info.crypt[ieee->crypt_info.tx_keyidx]; | ||
156 | int res; | 157 | int res; |
157 | 158 | ||
158 | if (crypt == NULL) | 159 | if (crypt == NULL) |
@@ -270,7 +271,7 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev) | |||
270 | .qos_ctl = 0 | 271 | .qos_ctl = 0 |
271 | }; | 272 | }; |
272 | u8 dest[ETH_ALEN], src[ETH_ALEN]; | 273 | u8 dest[ETH_ALEN], src[ETH_ALEN]; |
273 | struct ieee80211_crypt_data *crypt; | 274 | struct lib80211_crypt_data *crypt; |
274 | int priority = skb->priority; | 275 | int priority = skb->priority; |
275 | int snapped = 0; | 276 | int snapped = 0; |
276 | 277 | ||
@@ -294,7 +295,7 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev) | |||
294 | 295 | ||
295 | ether_type = ((struct ethhdr *)skb->data)->h_proto; | 296 | ether_type = ((struct ethhdr *)skb->data)->h_proto; |
296 | 297 | ||
297 | crypt = ieee->crypt[ieee->tx_keyidx]; | 298 | crypt = ieee->crypt_info.crypt[ieee->crypt_info.tx_keyidx]; |
298 | 299 | ||
299 | encrypt = !(ether_type == htons(ETH_P_PAE) && ieee->ieee802_1x) && | 300 | encrypt = !(ether_type == htons(ETH_P_PAE) && ieee->ieee802_1x) && |
300 | ieee->sec.encrypt; | 301 | ieee->sec.encrypt; |