libertas: convert SNMP_MIB to a direct command
PATCH 1/1 libertas: convert SNMP_MIB to a direct command
And support setting both long and short retries independently.
Signed-off-by Dan Williams <[email protected]>
drivers/net/wireless/libertas/assoc.c +1 -5
@@ -823,11 +823,7 @@ static int assoc_helper_mode(struct lbs_private *priv, } priv->mode = assoc_req->mode; - ret =lbs_prepare_and_send_command (priv, -CMD_802_11_SNMP_MIB , -0 ,CMD_OPTION_WAITFORRSP , -OID_802_11_INFRASTRUCTURE_MODE , -/* Shoot me now */ (void *) (size_t ) assoc_req->mode); + ret =lbs_set_snmp_mib (priv,SNMP_MIB_OID_BSS_TYPE , assoc_req->mode); done:lbs_deb_leave_args (LBS_DEB_ASSOC ,"ret %d" , ret);
drivers/net/wireless/libertas/cmd.c +77 -103
212 lines not on this page · raw message
drivers/net/wireless/libertas/cmd.h +4 -0
@@ -67,4 +67,8 @@ int lbs_set_tx_power(struct lbs_private *priv, s16 dbm);int lbs_set_radio (struct lbs_private *priv,u8 preamble,u8 radio_on); +int lbs_set_snmp_mib (struct lbs_private *priv,u32 oid,u16 val); + +int lbs_get_snmp_mib (struct lbs_private *priv,u32 oid,u16 *out_val); +#endif /* _LBS_CMD_H */
drivers/net/wireless/libertas/cmdresp.c +0 -46
58 lines not on this page · raw message
drivers/net/wireless/libertas/defs.h +0 -27
@@ -343,27 +343,6 @@ enum mv_ms_type {MVMS_EVENT }; -/** SNMP_MIB_INDEX_e */ -enum SNMP_MIB_INDEX_e { -DESIRED_BSSTYPE_I =0 , -OP_RATESET_I , -BCNPERIOD_I , -DTIMPERIOD_I , -ASSOCRSP_TIMEOUT_I , -RTSTHRESH_I , -SHORT_RETRYLIM_I , -LONG_RETRYLIM_I , -FRAGTHRESH_I , -DOT11D_I , -DOT11H_I , -MANUFID_I , -PRODID_I , -MANUF_OUI_I , -MANUF_NAME_I , -MANUF_PRODNAME_I , -MANUF_PRODVER_I , -}; -/** KEY_TYPE_ID */ enum KEY_TYPE_ID {KEY_TYPE_ID_WEP =0 ,
@@ -378,12 +357,6 @@ enum KEY_INFO_WPA { KEY_INFO_WPA_ENABLED = 0x04 }; -/** SNMP_MIB_VALUE_e */ -enum SNMP_MIB_VALUE_e { -SNMP_MIB_VALUE_INFRA =1 , -SNMP_MIB_VALUE_ADHOC -}; -/* Default values for fwt commands. */ #define FWT_DEFAULT_METRIC 0#define FWT_DEFAULT_DIR 1
drivers/net/wireless/libertas/dev.h +0 -3
@@ -240,9 +240,6 @@ struct lbs_private {uint16_t enablehwauto;uint16_t ratebitmap; -u32 fragthsd; -u32 rtsthsd; -u8 txretrycount;/** Tx-related variables (for single packet tx) */
drivers/net/wireless/libertas/host.h +13 -11
@@ -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 */
@@ -190,6 +179,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
drivers/net/wireless/libertas/hostcmd.h +3 -2
@@ -301,7 +301,9 @@ struct cmd_ds_802_11_get_stat { };struct cmd_ds_802_11_snmp_mib { -__le16 querytype; +struct cmd_header hdr; + +__le16 action;__le16 oid;__le16 bufsize;u8 value[128 ];
@@ -707,7 +709,6 @@ struct cmd_ds_command {struct cmd_ds_802_11_authenticate auth;struct cmd_ds_802_11_get_stat gstat;struct cmd_ds_802_3_get_stat gstat_8023; -struct cmd_ds_802_11_snmp_mib smib;struct cmd_ds_802_11_rf_antenna rant;struct cmd_ds_802_11_monitor_mode monitor;struct cmd_ds_802_11_rssi rssi;
drivers/net/wireless/libertas/wext.c +74 -67
222 lines not on this page · raw message