1 files changed, 17 insertions, 34 deletions

diff --git a/drivers/net/wireless/libertas/host.h b/drivers/net/wireless/libertas/host.h
index c92e41b4faf4..5004d7679c02 100644
--- a/drivers/net/wireless/libertas/host.h
+++ b/drivers/net/wireless/libertas/host.h
@@ -9,17 +9,6 @@
 #define DEFAULT_AD_HOC_CHANNEL                  6
 #define DEFAULT_AD_HOC_CHANNEL_A                36
 
-/** IEEE 802.11 oids */
-#define OID_802_11_SSID                         0x00008002
-#define OID_802_11_INFRASTRUCTURE_MODE          0x00008008
-#define OID_802_11_FRAGMENTATION_THRESHOLD      0x00008009
-#define OID_802_11_RTS_THRESHOLD                0x0000800A
-#define OID_802_11_TX_ANTENNA_SELECTED          0x0000800D
-#define OID_802_11_SUPPORTED_RATES              0x0000800E
-#define OID_802_11_STATISTICS                   0x00008012
-#define OID_802_11_TX_RETRYCOUNT                0x0000801D
-#define OID_802_11D_ENABLE                      0x00008020
-
 #define CMD_OPTION_WAITFORRSP                   0x0002
 
 /** Host command IDs */
@@ -61,7 +50,6 @@
 #define CMD_RF_REG_MAP                          0x0023
 #define CMD_802_11_DEAUTHENTICATE               0x0024
 #define CMD_802_11_REASSOCIATE                  0x0025
-#define CMD_802_11_DISASSOCIATE                 0x0026
 #define CMD_MAC_CONTROL                         0x0028
 #define CMD_802_11_AD_HOC_START                 0x002b
 #define CMD_802_11_AD_HOC_JOIN                  0x002c
@@ -84,6 +72,7 @@
 #define CMD_802_11_INACTIVITY_TIMEOUT           0x0067
 #define CMD_802_11_SLEEP_PERIOD                 0x0068
 #define CMD_802_11_TPC_CFG                      0x0072
+#define CMD_802_11_PA_CFG                       0x0073
 #define CMD_802_11_FW_WAKE_METHOD               0x0074
 #define CMD_802_11_SUBSCRIBE_EVENT              0x0075
 #define CMD_802_11_RATE_ADAPT_RATESET           0x0076
@@ -153,11 +142,6 @@
 #define CMD_ACT_MAC_ALL_MULTICAST_ENABLE        0x0100
 #define CMD_ACT_MAC_STRICT_PROTECTION_ENABLE    0x0400
 
-/* Define action or option for CMD_802_11_RADIO_CONTROL */
-#define CMD_TYPE_AUTO_PREAMBLE          0x0001
-#define CMD_TYPE_SHORT_PREAMBLE         0x0002
-#define CMD_TYPE_LONG_PREAMBLE          0x0003
-
 /* Event flags for CMD_802_11_SUBSCRIBE_EVENT */
 #define CMD_SUBSCRIBE_RSSI_LOW          0x0001
 #define CMD_SUBSCRIBE_SNR_LOW           0x0002
@@ -166,28 +150,14 @@
 #define CMD_SUBSCRIBE_RSSI_HIGH         0x0010
 #define CMD_SUBSCRIBE_SNR_HIGH          0x0020
 
-#define TURN_ON_RF                      0x01
-#define RADIO_ON                        0x01
-#define RADIO_OFF                       0x00
-
-#define SET_AUTO_PREAMBLE               0x05
-#define SET_SHORT_PREAMBLE              0x03
-#define SET_LONG_PREAMBLE               0x01
+#define RADIO_PREAMBLE_LONG     0x00
+#define RADIO_PREAMBLE_SHORT    0x02
+#define RADIO_PREAMBLE_AUTO     0x04
 
 /* Define action or option for CMD_802_11_RF_CHANNEL */
 #define CMD_OPT_802_11_RF_CHANNEL_GET   0x00
 #define CMD_OPT_802_11_RF_CHANNEL_SET   0x01
 
-/* Define action or option for CMD_802_11_RF_TX_POWER */
-#define CMD_ACT_TX_POWER_OPT_GET        0x0000
-#define CMD_ACT_TX_POWER_OPT_SET_HIGH   0x8007
-#define CMD_ACT_TX_POWER_OPT_SET_MID    0x8004
-#define CMD_ACT_TX_POWER_OPT_SET_LOW    0x8000
-
-#define CMD_ACT_TX_POWER_INDEX_HIGH     0x0007
-#define CMD_ACT_TX_POWER_INDEX_MID      0x0004
-#define CMD_ACT_TX_POWER_INDEX_LOW      0x0000
-
 /* Define action or option for CMD_802_11_DATA_RATE */
 #define CMD_ACT_SET_TX_AUTO             0x0000
 #define CMD_ACT_SET_TX_FIX_RATE         0x0001
@@ -210,6 +180,19 @@
 #define CMD_WAKE_METHOD_COMMAND_INT     0x0001
 #define CMD_WAKE_METHOD_GPIO            0x0002
 
+/* Object IDs for CMD_802_11_SNMP_MIB */
+#define SNMP_MIB_OID_BSS_TYPE           0x0000
+#define SNMP_MIB_OID_OP_RATE_SET        0x0001
+#define SNMP_MIB_OID_BEACON_PERIOD      0x0002  /* Reserved on v9+ */
+#define SNMP_MIB_OID_DTIM_PERIOD        0x0003  /* Reserved on v9+ */
+#define SNMP_MIB_OID_ASSOC_TIMEOUT      0x0004  /* Reserved on v9+ */
+#define SNMP_MIB_OID_RTS_THRESHOLD      0x0005
+#define SNMP_MIB_OID_SHORT_RETRY_LIMIT  0x0006
+#define SNMP_MIB_OID_LONG_RETRY_LIMIT   0x0007
+#define SNMP_MIB_OID_FRAG_THRESHOLD     0x0008
+#define SNMP_MIB_OID_11D_ENABLE         0x0009
+#define SNMP_MIB_OID_11H_ENABLE         0x000A
+
 /* Define action or option for CMD_BT_ACCESS */
 enum cmd_bt_access_opts {
         /* The bt commands start at 5 instead of 1 because the old dft commands