[PATCH] libertas: clean up scan debug messages

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / libertas / scan.h

diff --git a/drivers/net/wireless/libertas/scan.h b/drivers/net/wireless/libertas/scan.h
index bd019e5ff1eb24f294fb7c12d0874017ecef7136..c29c031bef8cf8a9798ee9bf31e9314e0acc0676 100644 (file)
--- a/drivers/net/wireless/libertas/scan.h
+++ b/drivers/net/wireless/libertas/scan.h
@@ -140,8 +140,7 @@ struct bss_descriptor {
        u8 ssid[IW_ESSID_MAX_SIZE + 1];
        u8 ssid_len;
 
-       /* WEP encryption requirement */
-       u32 privacy;
+       u16 capability;
 
        /* receive signal strength in dBm */
        long rssi;
@@ -152,18 +151,16 @@ struct bss_descriptor {
 
        u32 atimwindow;
 
+       /* IW_MODE_AUTO, IW_MODE_ADHOC, IW_MODE_INFRA */
        u8 mode;
-       u8 libertas_supported_rates[WLAN_SUPPORTED_RATES];
 
-       __le64 timestamp;       //!< TSF value included in the beacon/probe response
+       /* zero-terminated array of supported data rates */
+       u8 rates[MAX_RATES + 1];
+
        unsigned long last_scanned;
 
        union ieeetypes_phyparamset phyparamset;
        union IEEEtypes_ssparamset ssparamset;
-       struct ieeetypes_capinfo cap;
-       u8 datarates[WLAN_SUPPORTED_RATES];
-
-       u64 networktsf;         //!< TSF timestamp from the current firmware TSF
 
        struct ieeetypes_countryinfofullset countryinfo;
 
@@ -172,34 +169,31 @@ struct bss_descriptor {
        u8 rsn_ie[MAX_WPA_IE_LEN];
        size_t rsn_ie_len;
 
+       u8 mesh;
+
        struct list_head list;
 };
 
-extern int libertas_ssid_cmp(u8 *ssid1, u8 ssid1_len, u8 *ssid2, u8 ssid2_len);
+int libertas_ssid_cmp(u8 *ssid1, u8 ssid1_len, u8 *ssid2, u8 ssid2_len);
 
 struct bss_descriptor * libertas_find_ssid_in_list(wlan_adapter * adapter,
                        u8 *ssid, u8 ssid_len, u8 * bssid, u8 mode,
                        int channel);
 
-struct bss_descriptor * libertas_find_best_ssid_in_list(wlan_adapter * adapter,
-                       u8 mode);
-
-extern struct bss_descriptor * libertas_find_bssid_in_list(wlan_adapter * adapter,
+struct bss_descriptor * libertas_find_bssid_in_list(wlan_adapter * adapter,
                        u8 * bssid, u8 mode);
 
 int libertas_find_best_network_ssid(wlan_private * priv, u8 *out_ssid,
                        u8 *out_ssid_len, u8 preferred_mode, u8 *out_mode);
 
-extern int libertas_send_specific_ssid_scan(wlan_private * priv, u8 *ssid,
+int libertas_send_specific_ssid_scan(wlan_private * priv, u8 *ssid,
                                u8 ssid_len, u8 clear_ssid);
-extern int libertas_send_specific_bssid_scan(wlan_private * priv,
-                                u8 * bssid, u8 clear_bssid);
 
-extern int libertas_cmd_80211_scan(wlan_private * priv,
+int libertas_cmd_80211_scan(wlan_private * priv,
                                struct cmd_ds_command *cmd,
                                void *pdata_buf);
 
-extern int libertas_ret_80211_scan(wlan_private * priv,
+int libertas_ret_80211_scan(wlan_private * priv,
                                struct cmd_ds_command *resp);
 
 int wlan_scan_networks(wlan_private * priv,
@@ -211,9 +205,11 @@ struct ifreq;
 struct iw_point;
 struct iw_param;
 struct iw_request_info;
-extern int libertas_get_scan(struct net_device *dev, struct iw_request_info *info,
+int libertas_get_scan(struct net_device *dev, struct iw_request_info *info,
                         struct iw_point *dwrq, char *extra);
-extern int libertas_set_scan(struct net_device *dev, struct iw_request_info *info,
+int libertas_set_scan(struct net_device *dev, struct iw_request_info *info,
                         struct iw_param *vwrq, char *extra);
 
+void libertas_scan_worker(struct work_struct *work);
+
 #endif                         /* _WLAN_SCAN_H */