diff options
author | Dan Williams <dcbw@redhat.com> | 2007-08-02 11:35:46 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:49:46 -0400 |
commit | ffcae953ac021f5051a201c18e133cb0ce38c2b9 (patch) | |
tree | 03ed982801c46501daf025c95401494359baf0ed /drivers/net/wireless/libertas | |
parent | 125dcabf724bdfbe55240aef3b35b0ca16f3d61d (diff) |
[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>
Diffstat (limited to 'drivers/net/wireless/libertas')
-rw-r--r-- | drivers/net/wireless/libertas/cmd.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/cmdresp.c | 6 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/fw.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/host.h | 24 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/wext.c | 4 |
5 files changed, 21 insertions, 21 deletions
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c index 401a630ed4e5..c96ced963d69 100644 --- 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, | |||
566 | S_DS_GEN); | 566 | S_DS_GEN); |
567 | 567 | ||
568 | rant->action = cpu_to_le16(cmd_action); | 568 | rant->action = cpu_to_le16(cmd_action); |
569 | if ((cmd_action == CMD_ACT_SET_rx) || (cmd_action == CMD_ACT_SET_tx)) { | 569 | if ((cmd_action == CMD_ACT_SET_RX) || (cmd_action == CMD_ACT_SET_TX)) { |
570 | rant->antennamode = cpu_to_le16((u16) (*(u32 *) pdata_buf)); | 570 | rant->antennamode = cpu_to_le16((u16) (*(u32 *) pdata_buf)); |
571 | } | 571 | } |
572 | 572 | ||
@@ -614,11 +614,11 @@ static int wlan_cmd_802_11_data_rate(wlan_private * priv, | |||
614 | 614 | ||
615 | pdatarate->action = cpu_to_le16(cmd_action); | 615 | pdatarate->action = cpu_to_le16(cmd_action); |
616 | 616 | ||
617 | if (cmd_action == CMD_ACT_SET_tx_fix_rate) { | 617 | if (cmd_action == CMD_ACT_SET_TX_FIX_RATE) { |
618 | pdatarate->datarate[0] = libertas_data_rate_to_index(adapter->datarate); | 618 | pdatarate->datarate[0] = libertas_data_rate_to_index(adapter->datarate); |
619 | lbs_deb_cmd("Setting FW for fixed rate 0x%02X\n", | 619 | lbs_deb_cmd("Setting FW for fixed rate 0x%02X\n", |
620 | adapter->datarate); | 620 | adapter->datarate); |
621 | } else if (cmd_action == CMD_ACT_SET_tx_auto) { | 621 | } else if (cmd_action == CMD_ACT_SET_TX_AUTO) { |
622 | lbs_deb_cmd("Setting FW for AUTO rate\n"); | 622 | lbs_deb_cmd("Setting FW for AUTO rate\n"); |
623 | } | 623 | } |
624 | 624 | ||
diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c index 4c15071984b9..d90279269e7b 100644 --- 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, | |||
396 | wlan_adapter *adapter = priv->adapter; | 396 | wlan_adapter *adapter = priv->adapter; |
397 | u16 action = le16_to_cpu(pAntenna->action); | 397 | u16 action = le16_to_cpu(pAntenna->action); |
398 | 398 | ||
399 | if (action == CMD_ACT_GET_rx) | 399 | if (action == CMD_ACT_GET_RX) |
400 | adapter->rxantennamode = le16_to_cpu(pAntenna->antennamode); | 400 | adapter->rxantennamode = le16_to_cpu(pAntenna->antennamode); |
401 | 401 | ||
402 | if (action == CMD_ACT_GET_tx) | 402 | if (action == CMD_ACT_GET_TX) |
403 | adapter->txantennamode = le16_to_cpu(pAntenna->antennamode); | 403 | adapter->txantennamode = le16_to_cpu(pAntenna->antennamode); |
404 | 404 | ||
405 | lbs_deb_cmd("RF_ANT_RESP: action = 0x%x, mode = 0x%04x\n", | 405 | 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, | |||
438 | (u8 *) pdatarate, sizeof(struct cmd_ds_802_11_data_rate)); | 438 | (u8 *) pdatarate, sizeof(struct cmd_ds_802_11_data_rate)); |
439 | 439 | ||
440 | dot11datarate = pdatarate->datarate[0]; | 440 | dot11datarate = pdatarate->datarate[0]; |
441 | if (pdatarate->action == cpu_to_le16(CMD_ACT_GET_tx_rate)) { | 441 | if (pdatarate->action == cpu_to_le16(CMD_ACT_GET_TX_RATE)) { |
442 | memcpy(adapter->libertas_supported_rates, pdatarate->datarate, | 442 | memcpy(adapter->libertas_supported_rates, pdatarate->datarate, |
443 | sizeof(adapter->libertas_supported_rates)); | 443 | sizeof(adapter->libertas_supported_rates)); |
444 | } | 444 | } |
diff --git a/drivers/net/wireless/libertas/fw.c b/drivers/net/wireless/libertas/fw.c index e7177598f94b..d214692eb209 100644 --- 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) | |||
111 | 111 | ||
112 | /* Get the supported Data rates */ | 112 | /* Get the supported Data rates */ |
113 | ret = libertas_prepare_and_send_command(priv, CMD_802_11_DATA_RATE, | 113 | ret = libertas_prepare_and_send_command(priv, CMD_802_11_DATA_RATE, |
114 | CMD_ACT_GET_tx_rate, | 114 | CMD_ACT_GET_TX_RATE, |
115 | CMD_OPTION_WAITFORRSP, 0, NULL); | 115 | CMD_OPTION_WAITFORRSP, 0, NULL); |
116 | 116 | ||
117 | if (ret) { | 117 | if (ret) { |
diff --git a/drivers/net/wireless/libertas/host.h b/drivers/net/wireless/libertas/host.h index 7af921b0832f..308ccdbed344 100644 --- a/drivers/net/wireless/libertas/host.h +++ b/drivers/net/wireless/libertas/host.h | |||
@@ -262,16 +262,16 @@ | |||
262 | #define CMD_ACT_TX_POWER_INDEX_LOW 0x0000 | 262 | #define CMD_ACT_TX_POWER_INDEX_LOW 0x0000 |
263 | 263 | ||
264 | /* Define action or option for CMD_802_11_DATA_RATE */ | 264 | /* Define action or option for CMD_802_11_DATA_RATE */ |
265 | #define CMD_ACT_SET_tx_auto 0x0000 | 265 | #define CMD_ACT_SET_TX_AUTO 0x0000 |
266 | #define CMD_ACT_SET_tx_fix_rate 0x0001 | 266 | #define CMD_ACT_SET_TX_FIX_RATE 0x0001 |
267 | #define CMD_ACT_GET_tx_rate 0x0002 | 267 | #define CMD_ACT_GET_TX_RATE 0x0002 |
268 | 268 | ||
269 | #define CMD_ACT_SET_rx 0x0001 | 269 | #define CMD_ACT_SET_RX 0x0001 |
270 | #define CMD_ACT_SET_tx 0x0002 | 270 | #define CMD_ACT_SET_TX 0x0002 |
271 | #define CMD_ACT_SET_both 0x0003 | 271 | #define CMD_ACT_SET_BOTH 0x0003 |
272 | #define CMD_ACT_GET_rx 0x0004 | 272 | #define CMD_ACT_GET_RX 0x0004 |
273 | #define CMD_ACT_GET_tx 0x0008 | 273 | #define CMD_ACT_GET_TX 0x0008 |
274 | #define CMD_ACT_GET_both 0x000c | 274 | #define CMD_ACT_GET_BOTH 0x000c |
275 | 275 | ||
276 | /* Define action or option for CMD_802_11_PS_MODE */ | 276 | /* Define action or option for CMD_802_11_PS_MODE */ |
277 | #define CMD_TYPE_CAM 0x0000 | 277 | #define CMD_TYPE_CAM 0x0000 |
@@ -279,7 +279,7 @@ | |||
279 | #define CMD_TYPE_FAST_PSP 0x0002 | 279 | #define CMD_TYPE_FAST_PSP 0x0002 |
280 | 280 | ||
281 | /* Define action or option for CMD_BT_ACCESS */ | 281 | /* Define action or option for CMD_BT_ACCESS */ |
282 | enum CMD_BT_ACCESS_opts { | 282 | enum cmd_bt_access_opts { |
283 | /* The bt commands start at 5 instead of 1 because the old dft commands | 283 | /* The bt commands start at 5 instead of 1 because the old dft commands |
284 | * are mapped to 1-4. These old commands are no longer maintained and | 284 | * are mapped to 1-4. These old commands are no longer maintained and |
285 | * should not be called. | 285 | * should not be called. |
@@ -293,7 +293,7 @@ enum CMD_BT_ACCESS_opts { | |||
293 | }; | 293 | }; |
294 | 294 | ||
295 | /* Define action or option for CMD_FWT_ACCESS */ | 295 | /* Define action or option for CMD_FWT_ACCESS */ |
296 | enum CMD_FWT_ACCESS_opts { | 296 | enum cmd_fwt_access_opts { |
297 | CMD_ACT_FWT_ACCESS_ADD = 1, | 297 | CMD_ACT_FWT_ACCESS_ADD = 1, |
298 | CMD_ACT_FWT_ACCESS_DEL, | 298 | CMD_ACT_FWT_ACCESS_DEL, |
299 | CMD_ACT_FWT_ACCESS_LOOKUP, | 299 | CMD_ACT_FWT_ACCESS_LOOKUP, |
@@ -306,7 +306,7 @@ enum CMD_FWT_ACCESS_opts { | |||
306 | }; | 306 | }; |
307 | 307 | ||
308 | /* Define action or option for CMD_MESH_ACCESS */ | 308 | /* Define action or option for CMD_MESH_ACCESS */ |
309 | enum CMD_MESH_ACCESS_opts { | 309 | enum cmd_mesh_access_opts { |
310 | CMD_ACT_MESH_GET_TTL = 1, | 310 | CMD_ACT_MESH_GET_TTL = 1, |
311 | CMD_ACT_MESH_SET_TTL, | 311 | CMD_ACT_MESH_SET_TTL, |
312 | CMD_ACT_MESH_GET_STATS, | 312 | CMD_ACT_MESH_GET_STATS, |
diff --git a/drivers/net/wireless/libertas/wext.c b/drivers/net/wireless/libertas/wext.c index 7cfca5f3a5ef..115f02c010a1 100644 --- 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, | |||
1128 | lbs_deb_wext("vwrq->value %d\n", vwrq->value); | 1128 | lbs_deb_wext("vwrq->value %d\n", vwrq->value); |
1129 | 1129 | ||
1130 | if (vwrq->value == -1) { | 1130 | if (vwrq->value == -1) { |
1131 | action = CMD_ACT_SET_tx_auto; // Auto | 1131 | action = CMD_ACT_SET_TX_AUTO; // Auto |
1132 | adapter->is_datarate_auto = 1; | 1132 | adapter->is_datarate_auto = 1; |
1133 | adapter->datarate = 0; | 1133 | adapter->datarate = 0; |
1134 | } else { | 1134 | } else { |
@@ -1155,7 +1155,7 @@ static int wlan_set_rate(struct net_device *dev, struct iw_request_info *info, | |||
1155 | } | 1155 | } |
1156 | 1156 | ||
1157 | adapter->datarate = data_rate; | 1157 | adapter->datarate = data_rate; |
1158 | action = CMD_ACT_SET_tx_fix_rate; | 1158 | action = CMD_ACT_SET_TX_FIX_RATE; |
1159 | adapter->is_datarate_auto = 0; | 1159 | adapter->is_datarate_auto = 0; |
1160 | } | 1160 | } |
1161 | 1161 | ||