diff options
author | Stanislaw Gruszka <sgruszka@redhat.com> | 2011-08-30 09:26:35 -0400 |
---|---|---|
committer | Stanislaw Gruszka <sgruszka@redhat.com> | 2011-11-15 07:12:21 -0500 |
commit | 4d69c7521a90cba945b4720672b4511b1e541189 (patch) | |
tree | 4ea1c32726e8d97e30d40ab5aa474f18e1e63082 /drivers/net/wireless/iwlegacy/3945-mac.c | |
parent | db7746f78cab25ee39dd20f61d9b2e6b5993d8fa (diff) |
iwlegacy: rename REPLY_ to N_ or C_
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Diffstat (limited to 'drivers/net/wireless/iwlegacy/3945-mac.c')
-rw-r--r-- | drivers/net/wireless/iwlegacy/3945-mac.c | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c index 2ff807515212..65cab84661ef 100644 --- a/drivers/net/wireless/iwlegacy/3945-mac.c +++ b/drivers/net/wireless/iwlegacy/3945-mac.c | |||
@@ -348,7 +348,7 @@ static int il3945_send_beacon_cmd(struct il_priv *il) | |||
348 | 348 | ||
349 | frame_size = il3945_hw_get_beacon_cmd(il, frame, rate); | 349 | frame_size = il3945_hw_get_beacon_cmd(il, frame, rate); |
350 | 350 | ||
351 | rc = il_send_cmd_pdu(il, REPLY_TX_BEACON, frame_size, | 351 | rc = il_send_cmd_pdu(il, C_TX_BEACON, frame_size, |
352 | &frame->u.cmd[0]); | 352 | &frame->u.cmd[0]); |
353 | 353 | ||
354 | il3945_free_frame(il, frame); | 354 | il3945_free_frame(il, frame); |
@@ -406,7 +406,7 @@ static void il3945_build_tx_cmd_hwcrypto(struct il_priv *il, | |||
406 | } | 406 | } |
407 | 407 | ||
408 | /* | 408 | /* |
409 | * handle build REPLY_TX command notification. | 409 | * handle build C_TX command notification. |
410 | */ | 410 | */ |
411 | static void il3945_build_tx_cmd_basic(struct il_priv *il, | 411 | static void il3945_build_tx_cmd_basic(struct il_priv *il, |
412 | struct il_device_cmd *cmd, | 412 | struct il_device_cmd *cmd, |
@@ -460,7 +460,7 @@ static void il3945_build_tx_cmd_basic(struct il_priv *il, | |||
460 | } | 460 | } |
461 | 461 | ||
462 | /* | 462 | /* |
463 | * start REPLY_TX command process | 463 | * start C_TX command process |
464 | */ | 464 | */ |
465 | static int il3945_tx_skb(struct il_priv *il, struct sk_buff *skb) | 465 | static int il3945_tx_skb(struct il_priv *il, struct sk_buff *skb) |
466 | { | 466 | { |
@@ -560,7 +560,7 @@ static int il3945_tx_skb(struct il_priv *il, struct sk_buff *skb) | |||
560 | * after Tx, uCode's Tx response will return this value so driver can | 560 | * after Tx, uCode's Tx response will return this value so driver can |
561 | * locate the frame within the tx queue and do post-tx processing. | 561 | * locate the frame within the tx queue and do post-tx processing. |
562 | */ | 562 | */ |
563 | out_cmd->hdr.cmd = REPLY_TX; | 563 | out_cmd->hdr.cmd = C_TX; |
564 | out_cmd->hdr.sequence = cpu_to_le16((u16)(QUEUE_TO_SEQ(txq_id) | | 564 | out_cmd->hdr.sequence = cpu_to_le16((u16)(QUEUE_TO_SEQ(txq_id) | |
565 | IDX_TO_SEQ(q->write_ptr))); | 565 | IDX_TO_SEQ(q->write_ptr))); |
566 | 566 | ||
@@ -672,7 +672,7 @@ static int il3945_get_measurement(struct il_priv *il, | |||
672 | struct il_spectrum_cmd spectrum; | 672 | struct il_spectrum_cmd spectrum; |
673 | struct il_rx_pkt *pkt; | 673 | struct il_rx_pkt *pkt; |
674 | struct il_host_cmd cmd = { | 674 | struct il_host_cmd cmd = { |
675 | .id = REPLY_SPECTRUM_MEASUREMENT_CMD, | 675 | .id = C_SPECTRUM_MEASUREMENT, |
676 | .data = (void *)&spectrum, | 676 | .data = (void *)&spectrum, |
677 | .flags = CMD_WANT_SKB, | 677 | .flags = CMD_WANT_SKB, |
678 | }; | 678 | }; |
@@ -717,7 +717,7 @@ static int il3945_get_measurement(struct il_priv *il, | |||
717 | 717 | ||
718 | pkt = (struct il_rx_pkt *)cmd.reply_page; | 718 | pkt = (struct il_rx_pkt *)cmd.reply_page; |
719 | if (pkt->hdr.flags & IL_CMD_FAILED_MSK) { | 719 | if (pkt->hdr.flags & IL_CMD_FAILED_MSK) { |
720 | IL_ERR("Bad return from REPLY_RX_ON_ASSOC command\n"); | 720 | IL_ERR("Bad return from N_RX_ON_ASSOC command\n"); |
721 | rc = -EIO; | 721 | rc = -EIO; |
722 | } | 722 | } |
723 | 723 | ||
@@ -786,7 +786,7 @@ static void il3945_rx_reply_add_sta(struct il_priv *il, | |||
786 | struct il_rx_pkt *pkt = rxb_addr(rxb); | 786 | struct il_rx_pkt *pkt = rxb_addr(rxb); |
787 | #endif | 787 | #endif |
788 | 788 | ||
789 | D_RX("Received REPLY_ADD_STA: 0x%02X\n", pkt->u.status); | 789 | D_RX("Received C_ADD_STA: 0x%02X\n", pkt->u.status); |
790 | } | 790 | } |
791 | 791 | ||
792 | static void il3945_rx_beacon_notif(struct il_priv *il, | 792 | static void il3945_rx_beacon_notif(struct il_priv *il, |
@@ -853,27 +853,27 @@ static void il3945_rx_card_state_notif(struct il_priv *il, | |||
853 | */ | 853 | */ |
854 | static void il3945_setup_rx_handlers(struct il_priv *il) | 854 | static void il3945_setup_rx_handlers(struct il_priv *il) |
855 | { | 855 | { |
856 | il->rx_handlers[REPLY_ALIVE] = il3945_rx_reply_alive; | 856 | il->rx_handlers[N_ALIVE] = il3945_rx_reply_alive; |
857 | il->rx_handlers[REPLY_ADD_STA] = il3945_rx_reply_add_sta; | 857 | il->rx_handlers[C_ADD_STA] = il3945_rx_reply_add_sta; |
858 | il->rx_handlers[REPLY_ERROR] = il_rx_reply_error; | 858 | il->rx_handlers[N_ERROR] = il_rx_reply_error; |
859 | il->rx_handlers[CHANNEL_SWITCH_NOTIFICATION] = il_rx_csa; | 859 | il->rx_handlers[N_CHANNEL_SWITCH] = il_rx_csa; |
860 | il->rx_handlers[SPECTRUM_MEASURE_NOTIFICATION] = | 860 | il->rx_handlers[N_SPECTRUM_MEASUREMENT] = |
861 | il_rx_spectrum_measure_notif; | 861 | il_rx_spectrum_measure_notif; |
862 | il->rx_handlers[PM_SLEEP_NOTIFICATION] = il_rx_pm_sleep_notif; | 862 | il->rx_handlers[N_PM_SLEEP] = il_rx_pm_sleep_notif; |
863 | il->rx_handlers[PM_DEBUG_STATISTIC_NOTIFIC] = | 863 | il->rx_handlers[N_PM_DEBUG_STATS] = |
864 | il_rx_pm_debug_stats_notif; | 864 | il_rx_pm_debug_stats_notif; |
865 | il->rx_handlers[BEACON_NOTIFICATION] = il3945_rx_beacon_notif; | 865 | il->rx_handlers[N_BEACON] = il3945_rx_beacon_notif; |
866 | 866 | ||
867 | /* | 867 | /* |
868 | * The same handler is used for both the REPLY to a discrete | 868 | * The same handler is used for both the REPLY to a discrete |
869 | * stats request from the host as well as for the periodic | 869 | * stats request from the host as well as for the periodic |
870 | * stats notifications (after received beacons) from the uCode. | 870 | * stats notifications (after received beacons) from the uCode. |
871 | */ | 871 | */ |
872 | il->rx_handlers[REPLY_STATS_CMD] = il3945_reply_stats; | 872 | il->rx_handlers[C_STATS] = il3945_reply_stats; |
873 | il->rx_handlers[STATS_NOTIFICATION] = il3945_hw_rx_stats; | 873 | il->rx_handlers[N_STATS] = il3945_hw_rx_stats; |
874 | 874 | ||
875 | il_setup_rx_scan_handlers(il); | 875 | il_setup_rx_scan_handlers(il); |
876 | il->rx_handlers[CARD_STATE_NOTIFICATION] = il3945_rx_card_state_notif; | 876 | il->rx_handlers[N_CARD_STATE] = il3945_rx_card_state_notif; |
877 | 877 | ||
878 | /* Set up hardware specific Rx handlers */ | 878 | /* Set up hardware specific Rx handlers */ |
879 | il3945_hw_rx_handler_setup(il); | 879 | il3945_hw_rx_handler_setup(il); |
@@ -1253,8 +1253,8 @@ static void il3945_rx_handle(struct il_priv *il) | |||
1253 | * Ucode should set SEQ_RX_FRAME bit if ucode-originated, | 1253 | * Ucode should set SEQ_RX_FRAME bit if ucode-originated, |
1254 | * but apparently a few don't get set; catch them here. */ | 1254 | * but apparently a few don't get set; catch them here. */ |
1255 | reclaim = !(pkt->hdr.sequence & SEQ_RX_FRAME) && | 1255 | reclaim = !(pkt->hdr.sequence & SEQ_RX_FRAME) && |
1256 | pkt->hdr.cmd != STATS_NOTIFICATION && | 1256 | pkt->hdr.cmd != N_STATS && |
1257 | pkt->hdr.cmd != REPLY_TX; | 1257 | pkt->hdr.cmd != C_TX; |
1258 | 1258 | ||
1259 | /* Based on type of command response or notification, | 1259 | /* Based on type of command response or notification, |
1260 | * handle those that need handling via function in | 1260 | * handle those that need handling via function in |
@@ -2137,9 +2137,9 @@ static int il3945_set_ucode_ptrs(struct il_priv *il) | |||
2137 | } | 2137 | } |
2138 | 2138 | ||
2139 | /** | 2139 | /** |
2140 | * il3945_init_alive_start - Called after REPLY_ALIVE notification received | 2140 | * il3945_init_alive_start - Called after N_ALIVE notification received |
2141 | * | 2141 | * |
2142 | * Called after REPLY_ALIVE notification received from "initialize" uCode. | 2142 | * Called after N_ALIVE notification received from "initialize" uCode. |
2143 | * | 2143 | * |
2144 | * Tell "initialize" uCode to go ahead and load the runtime uCode. | 2144 | * Tell "initialize" uCode to go ahead and load the runtime uCode. |
2145 | */ | 2145 | */ |
@@ -2180,7 +2180,7 @@ static void il3945_init_alive_start(struct il_priv *il) | |||
2180 | } | 2180 | } |
2181 | 2181 | ||
2182 | /** | 2182 | /** |
2183 | * il3945_alive_start - called after REPLY_ALIVE notification received | 2183 | * il3945_alive_start - called after N_ALIVE notification received |
2184 | * from protocol/runtime uCode (initialization uCode's | 2184 | * from protocol/runtime uCode (initialization uCode's |
2185 | * Alive gets handled by il3945_init_alive_start()). | 2185 | * Alive gets handled by il3945_init_alive_start()). |
2186 | */ | 2186 | */ |
@@ -2553,7 +2553,7 @@ static void il3945_rfkill_poll(struct work_struct *data) | |||
2553 | int il3945_request_scan(struct il_priv *il, struct ieee80211_vif *vif) | 2553 | int il3945_request_scan(struct il_priv *il, struct ieee80211_vif *vif) |
2554 | { | 2554 | { |
2555 | struct il_host_cmd cmd = { | 2555 | struct il_host_cmd cmd = { |
2556 | .id = REPLY_SCAN_CMD, | 2556 | .id = C_SCAN, |
2557 | .len = sizeof(struct il3945_scan_cmd), | 2557 | .len = sizeof(struct il3945_scan_cmd), |
2558 | .flags = CMD_SIZE_HUGE, | 2558 | .flags = CMD_SIZE_HUGE, |
2559 | }; | 2559 | }; |
@@ -2767,7 +2767,7 @@ void il3945_post_associate(struct il_priv *il) | |||
2767 | 2767 | ||
2768 | rc = il_send_rxon_timing(il, ctx); | 2768 | rc = il_send_rxon_timing(il, ctx); |
2769 | if (rc) | 2769 | if (rc) |
2770 | IL_WARN("REPLY_RXON_TIMING failed - " | 2770 | IL_WARN("C_RXON_TIMING failed - " |
2771 | "Attempting to continue.\n"); | 2771 | "Attempting to continue.\n"); |
2772 | 2772 | ||
2773 | ctx->staging.filter_flags |= RXON_FILTER_ASSOC_MSK; | 2773 | ctx->staging.filter_flags |= RXON_FILTER_ASSOC_MSK; |
@@ -2931,7 +2931,7 @@ void il3945_config_ap(struct il_priv *il) | |||
2931 | /* RXON Timing */ | 2931 | /* RXON Timing */ |
2932 | rc = il_send_rxon_timing(il, ctx); | 2932 | rc = il_send_rxon_timing(il, ctx); |
2933 | if (rc) | 2933 | if (rc) |
2934 | IL_WARN("REPLY_RXON_TIMING failed - " | 2934 | IL_WARN("C_RXON_TIMING failed - " |
2935 | "Attempting to continue.\n"); | 2935 | "Attempting to continue.\n"); |
2936 | 2936 | ||
2937 | ctx->staging.assoc_id = 0; | 2937 | ctx->staging.assoc_id = 0; |
@@ -3657,12 +3657,12 @@ static int il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *en | |||
3657 | 3657 | ||
3658 | il->ctx.ctxid = 0; | 3658 | il->ctx.ctxid = 0; |
3659 | 3659 | ||
3660 | il->ctx.rxon_cmd = REPLY_RXON; | 3660 | il->ctx.rxon_cmd = C_RXON; |
3661 | il->ctx.rxon_timing_cmd = REPLY_RXON_TIMING; | 3661 | il->ctx.rxon_timing_cmd = C_RXON_TIMING; |
3662 | il->ctx.rxon_assoc_cmd = REPLY_RXON_ASSOC; | 3662 | il->ctx.rxon_assoc_cmd = C_RXON_ASSOC; |
3663 | il->ctx.qos_cmd = REPLY_QOS_PARAM; | 3663 | il->ctx.qos_cmd = C_QOS_PARAM; |
3664 | il->ctx.ap_sta_id = IL_AP_ID; | 3664 | il->ctx.ap_sta_id = IL_AP_ID; |
3665 | il->ctx.wep_key_cmd = REPLY_WEPKEY; | 3665 | il->ctx.wep_key_cmd = C_WEPKEY; |
3666 | il->ctx.interface_modes = | 3666 | il->ctx.interface_modes = |
3667 | BIT(NL80211_IFTYPE_STATION) | | 3667 | BIT(NL80211_IFTYPE_STATION) | |
3668 | BIT(NL80211_IFTYPE_ADHOC); | 3668 | BIT(NL80211_IFTYPE_ADHOC); |