[PATCH] libertas: fix more mixed-case abuse

Mistakently introduced by a previous patch to upper-case all command
constants.

Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index 401a630..c96ced9 100644 (file)
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -566,7 +566,7 @@ static int wlan_cmd_802_11_rf_antenna(wlan_private * priv,
                                S_DS_GEN);
 
        rant->action = cpu_to_le16(cmd_action);
-       if ((cmd_action == CMD_ACT_SET_rx) || (cmd_action == CMD_ACT_SET_tx)) {
+       if ((cmd_action == CMD_ACT_SET_RX) || (cmd_action == CMD_ACT_SET_TX)) {
                rant->antennamode = cpu_to_le16((u16) (*(u32 *) pdata_buf));
        }
 
@@ -614,11 +614,11 @@ static int wlan_cmd_802_11_data_rate(wlan_private * priv,
 
        pdatarate->action = cpu_to_le16(cmd_action);
 
-       if (cmd_action == CMD_ACT_SET_tx_fix_rate) {
+       if (cmd_action == CMD_ACT_SET_TX_FIX_RATE) {
                pdatarate->datarate[0] = libertas_data_rate_to_index(adapter->datarate);
                lbs_deb_cmd("Setting FW for fixed rate 0x%02X\n",
                       adapter->datarate);
-       } else if (cmd_action == CMD_ACT_SET_tx_auto) {
+       } else if (cmd_action == CMD_ACT_SET_TX_AUTO) {
                lbs_deb_cmd("Setting FW for AUTO rate\n");
        }
 

diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c
index 4c15071..d902792 100644 (file)
--- a/drivers/net/wireless/libertas/cmdresp.c
+++ b/drivers/net/wireless/libertas/cmdresp.c
@@ -396,10 +396,10 @@ static int wlan_ret_802_11_rf_antenna(wlan_private * priv,
        wlan_adapter *adapter = priv->adapter;
        u16 action = le16_to_cpu(pAntenna->action);
 
-       if (action == CMD_ACT_GET_rx)
+       if (action == CMD_ACT_GET_RX)
                adapter->rxantennamode = le16_to_cpu(pAntenna->antennamode);
 
-       if (action == CMD_ACT_GET_tx)
+       if (action == CMD_ACT_GET_TX)
                adapter->txantennamode = le16_to_cpu(pAntenna->antennamode);
 
        lbs_deb_cmd("RF_ANT_RESP: action = 0x%x, mode = 0x%04x\n",
@@ -438,7 +438,7 @@ static int wlan_ret_802_11_data_rate(wlan_private * priv,
                (u8 *) pdatarate, sizeof(struct cmd_ds_802_11_data_rate));
 
        dot11datarate = pdatarate->datarate[0];
-       if (pdatarate->action == cpu_to_le16(CMD_ACT_GET_tx_rate)) {
+       if (pdatarate->action == cpu_to_le16(CMD_ACT_GET_TX_RATE)) {
                memcpy(adapter->libertas_supported_rates, pdatarate->datarate,
                       sizeof(adapter->libertas_supported_rates));
        }

diff --git a/drivers/net/wireless/libertas/fw.c b/drivers/net/wireless/libertas/fw.c
index e717759..d214692 100644 (file)
--- a/drivers/net/wireless/libertas/fw.c
+++ b/drivers/net/wireless/libertas/fw.c
@@ -111,7 +111,7 @@ static int wlan_setup_station_hw(wlan_private * priv, char *fw_name)
 
        /* Get the supported Data rates */
        ret = libertas_prepare_and_send_command(priv, CMD_802_11_DATA_RATE,
-                                   CMD_ACT_GET_tx_rate,
+                                   CMD_ACT_GET_TX_RATE,
                                    CMD_OPTION_WAITFORRSP, 0, NULL);
 
        if (ret) {

diff --git a/drivers/net/wireless/libertas/host.h b/drivers/net/wireless/libertas/host.h
index 7af921b..308ccdb 100644 (file)
--- a/drivers/net/wireless/libertas/host.h
+++ b/drivers/net/wireless/libertas/host.h
@@ -262,16 +262,16 @@
 #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
-#define CMD_ACT_GET_tx_rate                 0x0002
+#define CMD_ACT_SET_TX_AUTO                 0x0000
+#define CMD_ACT_SET_TX_FIX_RATE             0x0001
+#define CMD_ACT_GET_TX_RATE                 0x0002
 
-#define CMD_ACT_SET_rx                      0x0001
-#define CMD_ACT_SET_tx                      0x0002
-#define CMD_ACT_SET_both                    0x0003
-#define CMD_ACT_GET_rx                      0x0004
-#define CMD_ACT_GET_tx                      0x0008
-#define CMD_ACT_GET_both                    0x000c
+#define CMD_ACT_SET_RX                      0x0001
+#define CMD_ACT_SET_TX                      0x0002
+#define CMD_ACT_SET_BOTH                    0x0003
+#define CMD_ACT_GET_RX                      0x0004
+#define CMD_ACT_GET_TX                      0x0008
+#define CMD_ACT_GET_BOTH                    0x000c
 
 /* Define action or option for CMD_802_11_PS_MODE */
 #define CMD_TYPE_CAM                        0x0000
@@ -279,7 +279,7 @@
 #define CMD_TYPE_FAST_PSP                   0x0002
 
 /* Define action or option for CMD_BT_ACCESS */
-enum CMD_BT_ACCESS_opts {
+enum cmd_bt_access_opts {
        /* The bt commands start at 5 instead of 1 because the old dft commands
         * are mapped to 1-4.  These old commands are no longer maintained and
         * should not be called.
@@ -293,7 +293,7 @@ enum CMD_BT_ACCESS_opts {
 };
 
 /* Define action or option for CMD_FWT_ACCESS */
-enum CMD_FWT_ACCESS_opts {
+enum cmd_fwt_access_opts {
        CMD_ACT_FWT_ACCESS_ADD = 1,
        CMD_ACT_FWT_ACCESS_DEL,
        CMD_ACT_FWT_ACCESS_LOOKUP,
@@ -306,7 +306,7 @@ enum CMD_FWT_ACCESS_opts {
 };
 
 /* Define action or option for CMD_MESH_ACCESS */
-enum CMD_MESH_ACCESS_opts {
+enum cmd_mesh_access_opts {
        CMD_ACT_MESH_GET_TTL = 1,
        CMD_ACT_MESH_SET_TTL,
        CMD_ACT_MESH_GET_STATS,

diff --git a/drivers/net/wireless/libertas/wext.c b/drivers/net/wireless/libertas/wext.c
index 7cfca5f..115f02c 100644 (file)
--- a/drivers/net/wireless/libertas/wext.c
+++ b/drivers/net/wireless/libertas/wext.c
@@ -1128,7 +1128,7 @@ static int wlan_set_rate(struct net_device *dev, struct iw_request_info *info,
        lbs_deb_wext("vwrq->value %d\n", vwrq->value);
 
        if (vwrq->value == -1) {
-               action = CMD_ACT_SET_tx_auto;   // Auto
+               action = CMD_ACT_SET_TX_AUTO;   // Auto
                adapter->is_datarate_auto = 1;
                adapter->datarate = 0;
        } else {
@@ -1155,7 +1155,7 @@ static int wlan_set_rate(struct net_device *dev, struct iw_request_info *info,
                }
 
                adapter->datarate = data_rate;
-               action = CMD_ACT_SET_tx_fix_rate;
+               action = CMD_ACT_SET_TX_FIX_RATE;
                adapter->is_datarate_auto = 0;
        }