aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlegacy/iwl3945-base.c
diff options
context:
space:
mode:
authorStanislaw Gruszka <sgruszka@redhat.com>2011-08-26 08:36:21 -0400
committerStanislaw Gruszka <sgruszka@redhat.com>2011-11-15 05:26:09 -0500
commitdcae1c641a4d7b7a00b1a566355ffaa517588aa6 (patch)
treedde489fb98abafcc547e80c3c2b46b22e9e4f4ab /drivers/net/wireless/iwlegacy/iwl3945-base.c
parentd31751679897441d89e6ae59da98f1424b3f7dfe (diff)
iwlegacy: s/iwl_rx_packet/iwl_rx_pkt/
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Diffstat (limited to 'drivers/net/wireless/iwlegacy/iwl3945-base.c')
-rw-r--r--drivers/net/wireless/iwlegacy/iwl3945-base.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/wireless/iwlegacy/iwl3945-base.c b/drivers/net/wireless/iwlegacy/iwl3945-base.c
index 2d1f22a53365..216c86fb0929 100644
--- a/drivers/net/wireless/iwlegacy/iwl3945-base.c
+++ b/drivers/net/wireless/iwlegacy/iwl3945-base.c
@@ -671,7 +671,7 @@ static int il3945_get_measurement(struct il_priv *il,
671 u8 type) 671 u8 type)
672{ 672{
673 struct il_spectrum_cmd spectrum; 673 struct il_spectrum_cmd spectrum;
674 struct il_rx_packet *pkt; 674 struct il_rx_pkt *pkt;
675 struct il_host_cmd cmd = { 675 struct il_host_cmd cmd = {
676 .id = REPLY_SPECTRUM_MEASUREMENT_CMD, 676 .id = REPLY_SPECTRUM_MEASUREMENT_CMD,
677 .data = (void *)&spectrum, 677 .data = (void *)&spectrum,
@@ -716,7 +716,7 @@ static int il3945_get_measurement(struct il_priv *il,
716 if (rc) 716 if (rc)
717 return rc; 717 return rc;
718 718
719 pkt = (struct il_rx_packet *)cmd.reply_page; 719 pkt = (struct il_rx_pkt *)cmd.reply_page;
720 if (pkt->hdr.flags & IL_CMD_FAILED_MSK) { 720 if (pkt->hdr.flags & IL_CMD_FAILED_MSK) {
721 IL_ERR("Bad return from REPLY_RX_ON_ASSOC command\n"); 721 IL_ERR("Bad return from REPLY_RX_ON_ASSOC command\n");
722 rc = -EIO; 722 rc = -EIO;
@@ -747,7 +747,7 @@ static int il3945_get_measurement(struct il_priv *il,
747static void il3945_rx_reply_alive(struct il_priv *il, 747static void il3945_rx_reply_alive(struct il_priv *il,
748 struct il_rx_mem_buffer *rxb) 748 struct il_rx_mem_buffer *rxb)
749{ 749{
750 struct il_rx_packet *pkt = rxb_addr(rxb); 750 struct il_rx_pkt *pkt = rxb_addr(rxb);
751 struct il_alive_resp *palive; 751 struct il_alive_resp *palive;
752 struct delayed_work *pwork; 752 struct delayed_work *pwork;
753 753
@@ -784,7 +784,7 @@ static void il3945_rx_reply_add_sta(struct il_priv *il,
784 struct il_rx_mem_buffer *rxb) 784 struct il_rx_mem_buffer *rxb)
785{ 785{
786#ifdef CONFIG_IWLEGACY_DEBUG 786#ifdef CONFIG_IWLEGACY_DEBUG
787 struct il_rx_packet *pkt = rxb_addr(rxb); 787 struct il_rx_pkt *pkt = rxb_addr(rxb);
788#endif 788#endif
789 789
790 D_RX("Received REPLY_ADD_STA: 0x%02X\n", pkt->u.status); 790 D_RX("Received REPLY_ADD_STA: 0x%02X\n", pkt->u.status);
@@ -793,7 +793,7 @@ static void il3945_rx_reply_add_sta(struct il_priv *il,
793static void il3945_rx_beacon_notif(struct il_priv *il, 793static void il3945_rx_beacon_notif(struct il_priv *il,
794 struct il_rx_mem_buffer *rxb) 794 struct il_rx_mem_buffer *rxb)
795{ 795{
796 struct il_rx_packet *pkt = rxb_addr(rxb); 796 struct il_rx_pkt *pkt = rxb_addr(rxb);
797 struct il3945_beacon_notif *beacon = &(pkt->u.beacon_status); 797 struct il3945_beacon_notif *beacon = &(pkt->u.beacon_status);
798#ifdef CONFIG_IWLEGACY_DEBUG 798#ifdef CONFIG_IWLEGACY_DEBUG
799 u8 rate = beacon->beacon_notify_hdr.rate; 799 u8 rate = beacon->beacon_notify_hdr.rate;
@@ -816,7 +816,7 @@ static void il3945_rx_beacon_notif(struct il_priv *il,
816static void il3945_rx_card_state_notif(struct il_priv *il, 816static void il3945_rx_card_state_notif(struct il_priv *il,
817 struct il_rx_mem_buffer *rxb) 817 struct il_rx_mem_buffer *rxb)
818{ 818{
819 struct il_rx_packet *pkt = rxb_addr(rxb); 819 struct il_rx_pkt *pkt = rxb_addr(rxb);
820 u32 flags = le32_to_cpu(pkt->u.card_state_notif.flags); 820 u32 flags = le32_to_cpu(pkt->u.card_state_notif.flags);
821 unsigned long status = il->status; 821 unsigned long status = il->status;
822 822
@@ -1202,7 +1202,7 @@ int il3945_calc_db_from_ratio(int sig_ratio)
1202static void il3945_rx_handle(struct il_priv *il) 1202static void il3945_rx_handle(struct il_priv *il)
1203{ 1203{
1204 struct il_rx_mem_buffer *rxb; 1204 struct il_rx_mem_buffer *rxb;
1205 struct il_rx_packet *pkt; 1205 struct il_rx_pkt *pkt;
1206 struct il_rx_queue *rxq = &il->rxq; 1206 struct il_rx_queue *rxq = &il->rxq;
1207 u32 r, i; 1207 u32 r, i;
1208 int reclaim; 1208 int reclaim;