libertas: implement new scanning logic

[linux-2.6] / drivers / net / wireless / libertas / wext.h

diff --git a/drivers/net/wireless/libertas/wext.h b/drivers/net/wireless/libertas/wext.h
index 15cfaaf0797ff7b43faee11f376fe45c9e79657d..a563d9a231b6d3e113f0bd7f30f6aa0ef43b8567 100644 (file)
--- a/drivers/net/wireless/libertas/wext.h
+++ b/drivers/net/wireless/libertas/wext.h
@@ -1,51 +1,11 @@
 /**
   * This file contains definition for IOCTL call.
   */
-#ifndef        _WLAN_WEXT_H_
-#define        _WLAN_WEXT_H_
+#ifndef        _LBS_WEXT_H_
+#define        _LBS_WEXT_H_
 
-#define SUBCMD_OFFSET                  4
-#define SUBCMD_DATA(x)                 *((int *)(x->u.name + SUBCMD_OFFSET))
-
-/** PRIVATE CMD ID */
-#define        WLANIOCTL                       SIOCIWFIRSTPRIV
-
-#define WLAN_SETNONE_GETNONE           (WLANIOCTL + 8)
-#define WLAN_SUBCMD_BT_RESET                   13
-#define WLAN_SUBCMD_FWT_RESET                  14
-
-#define WLAN_SETNONE_GETONEINT         (WLANIOCTL + 15)
-#define WLANGETREGION                          1
-
-#define WLAN_SUBCMD_FWT_CLEANUP                        15
-#define WLAN_SUBCMD_FWT_TIME                   16
-#define WLAN_SUBCMD_MESH_GET_TTL               17
-
-#define WLAN_SETONEINT_GETNONE         (WLANIOCTL + 24)
-#define WLANSETREGION                          8
-#define WLAN_SUBCMD_MESH_SET_TTL               18
-
-#define WLAN_SET128CHAR_GET128CHAR     (WLANIOCTL + 25)
-#define WLAN_SUBCMD_BT_ADD                     18
-#define WLAN_SUBCMD_BT_DEL                     19
-#define WLAN_SUBCMD_BT_LIST                    20
-#define WLAN_SUBCMD_FWT_ADD                            21
-#define WLAN_SUBCMD_FWT_DEL            22
-#define WLAN_SUBCMD_FWT_LOOKUP         23
-#define WLAN_SUBCMD_FWT_LIST_NEIGHBOR                  24
-#define WLAN_SUBCMD_FWT_LIST                   25
-#define WLAN_SUBCMD_FWT_LIST_ROUTE                     26
-
-#define WLAN_SET_GET_SIXTEEN_INT       (WLANIOCTL + 29)
-#define WLAN_LED_GPIO_CTRL                     5
-
-#define WLAN_LINKMODE_802_3                    0
-#define WLAN_LINKMODE_802_11                   2
-#define WLAN_RADIOMODE_NONE                            0
-#define WLAN_RADIOMODE_RADIOTAP                        2
-
-/** wlan_ioctl_regrdwr */
-struct wlan_ioctl_regrdwr {
+/** lbs_ioctl_regrdwr */
+struct lbs_ioctl_regrdwr {
        /** Which register to access */
        u16 whichreg;
        /** Read or Write */
@@ -55,8 +15,9 @@ struct wlan_ioctl_regrdwr {
        u32 value;
 };
 
-extern struct iw_handler_def libertas_handler_def;
-int libertas_do_ioctl(struct net_device *dev, struct ifreq *req, int i);
-int wlan_radio_ioctl(wlan_private * priv, u8 option);
+#define LBS_MONITOR_OFF                        0
+
+extern struct iw_handler_def lbs_handler_def;
+extern struct iw_handler_def mesh_handler_def;
 
-#endif                         /* _WLAN_WEXT_H_ */
+#endif