aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlegacy/iwl-sta.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/iwlegacy/iwl-sta.c')
-rw-r--r--drivers/net/wireless/iwlegacy/iwl-sta.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/net/wireless/iwlegacy/iwl-sta.c b/drivers/net/wireless/iwlegacy/iwl-sta.c
index a48af855dc01..42033d2ef6d4 100644
--- a/drivers/net/wireless/iwlegacy/iwl-sta.c
+++ b/drivers/net/wireless/iwlegacy/iwl-sta.c
@@ -41,7 +41,7 @@ static void il_sta_ucode_activate(struct il_priv *il, u8 sta_id)
41{ 41{
42 42
43 if (!(il->stations[sta_id].used & IL_STA_DRIVER_ACTIVE)) 43 if (!(il->stations[sta_id].used & IL_STA_DRIVER_ACTIVE))
44 IL_ERR(il, 44 IL_ERR(
45 "ACTIVATE a non DRIVER active station id %u addr %pM\n", 45 "ACTIVATE a non DRIVER active station id %u addr %pM\n",
46 sta_id, il->stations[sta_id].sta.sta.addr); 46 sta_id, il->stations[sta_id].sta.sta.addr);
47 47
@@ -67,7 +67,7 @@ static int il_process_add_sta_resp(struct il_priv *il,
67 int ret = -EIO; 67 int ret = -EIO;
68 68
69 if (pkt->hdr.flags & IL_CMD_FAILED_MSK) { 69 if (pkt->hdr.flags & IL_CMD_FAILED_MSK) {
70 IL_ERR(il, "Bad return from REPLY_ADD_STA (0x%08X)\n", 70 IL_ERR("Bad return from REPLY_ADD_STA (0x%08X)\n",
71 pkt->hdr.flags); 71 pkt->hdr.flags);
72 return ret; 72 return ret;
73 } 73 }
@@ -84,16 +84,16 @@ static int il_process_add_sta_resp(struct il_priv *il,
84 ret = 0; 84 ret = 0;
85 break; 85 break;
86 case ADD_STA_NO_ROOM_IN_TABLE: 86 case ADD_STA_NO_ROOM_IN_TABLE:
87 IL_ERR(il, "Adding station %d failed, no room in table.\n", 87 IL_ERR("Adding station %d failed, no room in table.\n",
88 sta_id); 88 sta_id);
89 break; 89 break;
90 case ADD_STA_NO_BLOCK_ACK_RESOURCE: 90 case ADD_STA_NO_BLOCK_ACK_RESOURCE:
91 IL_ERR(il, 91 IL_ERR(
92 "Adding station %d failed, no block ack resource.\n", 92 "Adding station %d failed, no block ack resource.\n",
93 sta_id); 93 sta_id);
94 break; 94 break;
95 case ADD_STA_MODIFY_NON_EXIST_STA: 95 case ADD_STA_MODIFY_NON_EXIST_STA:
96 IL_ERR(il, "Attempting to modify non-existing station %d\n", 96 IL_ERR("Attempting to modify non-existing station %d\n",
97 sta_id); 97 sta_id);
98 break; 98 break;
99 default: 99 default:
@@ -206,7 +206,7 @@ static void il_set_ht_add_station(struct il_priv *il, u8 index,
206 case WLAN_HT_CAP_SM_PS_DISABLED: 206 case WLAN_HT_CAP_SM_PS_DISABLED:
207 break; 207 break;
208 default: 208 default:
209 IL_WARN(il, "Invalid MIMO PS mode %d\n", mimo_ps_mode); 209 IL_WARN("Invalid MIMO PS mode %d\n", mimo_ps_mode);
210 break; 210 break;
211 } 211 }
212 212
@@ -343,7 +343,7 @@ il_add_station_common(struct il_priv *il,
343 spin_lock_irqsave(&il->sta_lock, flags_spin); 343 spin_lock_irqsave(&il->sta_lock, flags_spin);
344 sta_id = il_prep_station(il, ctx, addr, is_ap, sta); 344 sta_id = il_prep_station(il, ctx, addr, is_ap, sta);
345 if (sta_id == IL_INVALID_STATION) { 345 if (sta_id == IL_INVALID_STATION) {
346 IL_ERR(il, "Unable to prepare station %pM for addition\n", 346 IL_ERR("Unable to prepare station %pM for addition\n",
347 addr); 347 addr);
348 spin_unlock_irqrestore(&il->sta_lock, flags_spin); 348 spin_unlock_irqrestore(&il->sta_lock, flags_spin);
349 return -EINVAL; 349 return -EINVAL;
@@ -380,7 +380,7 @@ il_add_station_common(struct il_priv *il,
380 ret = il_send_add_sta(il, &sta_cmd, CMD_SYNC); 380 ret = il_send_add_sta(il, &sta_cmd, CMD_SYNC);
381 if (ret) { 381 if (ret) {
382 spin_lock_irqsave(&il->sta_lock, flags_spin); 382 spin_lock_irqsave(&il->sta_lock, flags_spin);
383 IL_ERR(il, "Adding station %pM failed.\n", 383 IL_ERR("Adding station %pM failed.\n",
384 il->stations[sta_id].sta.sta.addr); 384 il->stations[sta_id].sta.sta.addr);
385 il->stations[sta_id].used &= ~IL_STA_DRIVER_ACTIVE; 385 il->stations[sta_id].used &= ~IL_STA_DRIVER_ACTIVE;
386 il->stations[sta_id].used &= ~IL_STA_UCODE_INPROGRESS; 386 il->stations[sta_id].used &= ~IL_STA_UCODE_INPROGRESS;
@@ -402,7 +402,7 @@ static void il_sta_ucode_deactivate(struct il_priv *il, u8 sta_id)
402 if ((il->stations[sta_id].used & 402 if ((il->stations[sta_id].used &
403 (IL_STA_UCODE_ACTIVE | IL_STA_DRIVER_ACTIVE)) != 403 (IL_STA_UCODE_ACTIVE | IL_STA_DRIVER_ACTIVE)) !=
404 IL_STA_UCODE_ACTIVE) 404 IL_STA_UCODE_ACTIVE)
405 IL_ERR(il, "removed non active STA %u\n", sta_id); 405 IL_ERR("removed non active STA %u\n", sta_id);
406 406
407 il->stations[sta_id].used &= ~IL_STA_UCODE_ACTIVE; 407 il->stations[sta_id].used &= ~IL_STA_UCODE_ACTIVE;
408 408
@@ -440,7 +440,7 @@ static int il_send_remove_station(struct il_priv *il,
440 440
441 pkt = (struct il_rx_packet *)cmd.reply_page; 441 pkt = (struct il_rx_packet *)cmd.reply_page;
442 if (pkt->hdr.flags & IL_CMD_FAILED_MSK) { 442 if (pkt->hdr.flags & IL_CMD_FAILED_MSK) {
443 IL_ERR(il, "Bad return from REPLY_REMOVE_STA (0x%08X)\n", 443 IL_ERR("Bad return from REPLY_REMOVE_STA (0x%08X)\n",
444 pkt->hdr.flags); 444 pkt->hdr.flags);
445 ret = -EIO; 445 ret = -EIO;
446 } 446 }
@@ -458,7 +458,7 @@ static int il_send_remove_station(struct il_priv *il,
458 break; 458 break;
459 default: 459 default:
460 ret = -EIO; 460 ret = -EIO;
461 IL_ERR(il, "REPLY_REMOVE_STA failed\n"); 461 IL_ERR("REPLY_REMOVE_STA failed\n");
462 break; 462 break;
463 } 463 }
464 } 464 }
@@ -618,7 +618,7 @@ il_restore_stations(struct il_priv *il, struct il_rxon_context *ctx)
618 ret = il_send_add_sta(il, &sta_cmd, CMD_SYNC); 618 ret = il_send_add_sta(il, &sta_cmd, CMD_SYNC);
619 if (ret) { 619 if (ret) {
620 spin_lock_irqsave(&il->sta_lock, flags_spin); 620 spin_lock_irqsave(&il->sta_lock, flags_spin);
621 IL_ERR(il, "Adding station %pM failed.\n", 621 IL_ERR("Adding station %pM failed.\n",
622 il->stations[i].sta.sta.addr); 622 il->stations[i].sta.sta.addr);
623 il->stations[i].used &= 623 il->stations[i].used &=
624 ~IL_STA_DRIVER_ACTIVE; 624 ~IL_STA_DRIVER_ACTIVE;
@@ -808,7 +808,7 @@ int il_mac_sta_remove(struct ieee80211_hw *hw,
808 sta->addr); 808 sta->addr);
809 ret = il_remove_station(il, sta_common->sta_id, sta->addr); 809 ret = il_remove_station(il, sta_common->sta_id, sta->addr);
810 if (ret) 810 if (ret)
811 IL_ERR(il, "Error removing station %pM\n", 811 IL_ERR("Error removing station %pM\n",
812 sta->addr); 812 sta->addr);
813 mutex_unlock(&il->mutex); 813 mutex_unlock(&il->mutex);
814 return ret; 814 return ret;