hostap: don't report useless WDS frames by default

[linux-2.6-block.git] / drivers / net / wireless / hostap / hostap_80211.h

diff --git a/drivers/net/wireless/hostap/hostap_80211.h b/drivers/net/wireless/hostap/hostap_80211.h
index bf506f50d72295a900402d51d3bb4747c64abaee..3694b1eba521cbca531bb56574abb643da79f9a8 100644 (file)
--- a/drivers/net/wireless/hostap/hostap_80211.h
+++ b/drivers/net/wireless/hostap/hostap_80211.h
@@ -1,53 +1,56 @@
 #ifndef HOSTAP_80211_H
 #define HOSTAP_80211_H
 
+#include <linux/types.h>
+#include <net/ieee80211_crypt.h>
+
 struct hostap_ieee80211_mgmt {
-       u16 frame_control;
-       u16 duration;
+       __le16 frame_control;
+       __le16 duration;
        u8 da[6];
        u8 sa[6];
        u8 bssid[6];
-       u16 seq_ctrl;
+       __le16 seq_ctrl;
        union {
                struct {
-                       u16 auth_alg;
-                       u16 auth_transaction;
-                       u16 status_code;
+                       __le16 auth_alg;
+                       __le16 auth_transaction;
+                       __le16 status_code;
                        /* possibly followed by Challenge text */
                        u8 variable[0];
                } __attribute__ ((packed)) auth;
                struct {
-                       u16 reason_code;
+                       __le16 reason_code;
                } __attribute__ ((packed)) deauth;
                struct {
-                       u16 capab_info;
-                       u16 listen_interval;
+                       __le16 capab_info;
+                       __le16 listen_interval;
                        /* followed by SSID and Supported rates */
                        u8 variable[0];
                } __attribute__ ((packed)) assoc_req;
                struct {
-                       u16 capab_info;
-                       u16 status_code;
-                       u16 aid;
+                       __le16 capab_info;
+                       __le16 status_code;
+                       __le16 aid;
                        /* followed by Supported rates */
                        u8 variable[0];
                } __attribute__ ((packed)) assoc_resp, reassoc_resp;
                struct {
-                       u16 capab_info;
-                       u16 listen_interval;
+                       __le16 capab_info;
+                       __le16 listen_interval;
                        u8 current_ap[6];
                        /* followed by SSID and Supported rates */
                        u8 variable[0];
                } __attribute__ ((packed)) reassoc_req;
                struct {
-                       u16 reason_code;
+                       __le16 reason_code;
                } __attribute__ ((packed)) disassoc;
                struct {
                } __attribute__ ((packed)) probe_req;
                struct {
                        u8 timestamp[8];
-                       u16 beacon_int;
-                       u16 capab_info;
+                       __le16 beacon_int;
+                       __le16 capab_info;
                        /* followed by some of SSID, Supported rates,
                         * FH Params, DS Params, CF Params, IBSS Params, TIM */
                        u8 variable[0];
@@ -68,11 +71,6 @@ struct hostap_80211_rx_status {
        u16 rate; /* in 100 kbps */
 };
 
-
-void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb,
-                    struct hostap_80211_rx_status *rx_stats);
-
-
 /* prism2_rx_80211 'type' argument */
 enum {
        PRISM2_RX_MONITOR, PRISM2_RX_MGMT, PRISM2_RX_NON_ASSOC,
@@ -89,8 +87,6 @@ void hostap_dump_rx_80211(const char *name, struct sk_buff *skb,
 void hostap_dump_tx_80211(const char *name, struct sk_buff *skb);
 int hostap_data_start_xmit(struct sk_buff *skb, struct net_device *dev);
 int hostap_mgmt_start_xmit(struct sk_buff *skb, struct net_device *dev);
-struct sk_buff * hostap_tx_encrypt(struct sk_buff *skb,
-                                  struct ieee80211_crypt_data *crypt);
 int hostap_master_start_xmit(struct sk_buff *skb, struct net_device *dev);
 
 #endif /* HOSTAP_80211_H */