aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/hostap/hostap_ap.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/hostap/hostap_ap.h')
-rw-r--r--drivers/net/wireless/hostap/hostap_ap.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/wireless/hostap/hostap_ap.h b/drivers/net/wireless/hostap/hostap_ap.h
index 10137f44436d..137f78e4532b 100644
--- a/drivers/net/wireless/hostap/hostap_ap.h
+++ b/drivers/net/wireless/hostap/hostap_ap.h
@@ -81,7 +81,7 @@ struct sta_info {
81 u32 tx_since_last_failure; 81 u32 tx_since_last_failure;
82 u32 tx_consecutive_exc; 82 u32 tx_consecutive_exc;
83 83
84 struct prism2_crypt_data *crypt; 84 struct ieee80211_crypt_data *crypt;
85 85
86 int ap; /* whether this station is an AP */ 86 int ap; /* whether this station is an AP */
87 87
@@ -216,7 +216,7 @@ struct ap_data {
216 216
217 /* WEP operations for generating challenges to be used with shared key 217 /* WEP operations for generating challenges to be used with shared key
218 * authentication */ 218 * authentication */
219 struct hostap_crypto_ops *crypt; 219 struct ieee80211_crypto_ops *crypt;
220 void *crypt_priv; 220 void *crypt_priv;
221#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */ 221#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
222}; 222};
@@ -236,7 +236,7 @@ typedef enum {
236struct hostap_tx_data { 236struct hostap_tx_data {
237 struct sk_buff *skb; 237 struct sk_buff *skb;
238 int host_encrypt; 238 int host_encrypt;
239 struct prism2_crypt_data *crypt; 239 struct ieee80211_crypt_data *crypt;
240 void *sta_ptr; 240 void *sta_ptr;
241}; 241};
242ap_tx_ret hostap_handle_sta_tx(local_info_t *local, struct hostap_tx_data *tx); 242ap_tx_ret hostap_handle_sta_tx(local_info_t *local, struct hostap_tx_data *tx);
@@ -253,7 +253,8 @@ ap_rx_ret hostap_handle_sta_rx(local_info_t *local, struct net_device *dev,
253 int wds); 253 int wds);
254int hostap_handle_sta_crypto(local_info_t *local, 254int hostap_handle_sta_crypto(local_info_t *local,
255 struct hostap_ieee80211_hdr *hdr, 255 struct hostap_ieee80211_hdr *hdr,
256 struct prism2_crypt_data **crypt, void **sta_ptr); 256 struct ieee80211_crypt_data **crypt,
257 void **sta_ptr);
257int hostap_is_sta_assoc(struct ap_data *ap, u8 *sta_addr); 258int hostap_is_sta_assoc(struct ap_data *ap, u8 *sta_addr);
258int hostap_is_sta_authorized(struct ap_data *ap, u8 *sta_addr); 259int hostap_is_sta_authorized(struct ap_data *ap, u8 *sta_addr);
259int hostap_add_sta(struct ap_data *ap, u8 *sta_addr); 260int hostap_add_sta(struct ap_data *ap, u8 *sta_addr);