diff options
Diffstat (limited to 'drivers/net/wireless/ath/ar9170/main.c')
-rw-r--r-- | drivers/net/wireless/ath/ar9170/main.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/net/wireless/ath/ar9170/main.c b/drivers/net/wireless/ath/ar9170/main.c index 7c4a7d84535c..0312cee39570 100644 --- a/drivers/net/wireless/ath/ar9170/main.c +++ b/drivers/net/wireless/ath/ar9170/main.c | |||
@@ -236,7 +236,7 @@ static void __ar9170_dump_txqueue(struct ar9170 *ar, | |||
236 | wiphy_name(ar->hw->wiphy), skb_queue_len(queue)); | 236 | wiphy_name(ar->hw->wiphy), skb_queue_len(queue)); |
237 | 237 | ||
238 | skb_queue_walk(queue, skb) { | 238 | skb_queue_walk(queue, skb) { |
239 | printk(KERN_DEBUG "index:%d => \n", i++); | 239 | printk(KERN_DEBUG "index:%d =>\n", i++); |
240 | ar9170_print_txheader(ar, skb); | 240 | ar9170_print_txheader(ar, skb); |
241 | } | 241 | } |
242 | if (i != skb_queue_len(queue)) | 242 | if (i != skb_queue_len(queue)) |
@@ -281,7 +281,7 @@ static void ar9170_dump_tx_status_ampdu(struct ar9170 *ar) | |||
281 | unsigned long flags; | 281 | unsigned long flags; |
282 | 282 | ||
283 | spin_lock_irqsave(&ar->tx_status_ampdu.lock, flags); | 283 | spin_lock_irqsave(&ar->tx_status_ampdu.lock, flags); |
284 | printk(KERN_DEBUG "%s: A-MPDU tx_status queue => \n", | 284 | printk(KERN_DEBUG "%s: A-MPDU tx_status queue =>\n", |
285 | wiphy_name(ar->hw->wiphy)); | 285 | wiphy_name(ar->hw->wiphy)); |
286 | __ar9170_dump_txqueue(ar, &ar->tx_status_ampdu); | 286 | __ar9170_dump_txqueue(ar, &ar->tx_status_ampdu); |
287 | spin_unlock_irqrestore(&ar->tx_status_ampdu.lock, flags); | 287 | spin_unlock_irqrestore(&ar->tx_status_ampdu.lock, flags); |
@@ -308,7 +308,7 @@ static void ar9170_recycle_expired(struct ar9170 *ar, | |||
308 | if (time_is_before_jiffies(arinfo->timeout)) { | 308 | if (time_is_before_jiffies(arinfo->timeout)) { |
309 | #ifdef AR9170_QUEUE_DEBUG | 309 | #ifdef AR9170_QUEUE_DEBUG |
310 | printk(KERN_DEBUG "%s: [%ld > %ld] frame expired => " | 310 | printk(KERN_DEBUG "%s: [%ld > %ld] frame expired => " |
311 | "recycle \n", wiphy_name(ar->hw->wiphy), | 311 | "recycle\n", wiphy_name(ar->hw->wiphy), |
312 | jiffies, arinfo->timeout); | 312 | jiffies, arinfo->timeout); |
313 | ar9170_print_txheader(ar, skb); | 313 | ar9170_print_txheader(ar, skb); |
314 | #endif /* AR9170_QUEUE_DEBUG */ | 314 | #endif /* AR9170_QUEUE_DEBUG */ |
@@ -689,7 +689,8 @@ void ar9170_handle_command_response(struct ar9170 *ar, void *buf, u32 len) | |||
689 | 689 | ||
690 | /* firmware debug */ | 690 | /* firmware debug */ |
691 | case 0xca: | 691 | case 0xca: |
692 | printk(KERN_DEBUG "ar9170 FW: %.*s\n", len - 4, (char *)buf + 4); | 692 | printk(KERN_DEBUG "ar9170 FW: %.*s\n", len - 4, |
693 | (char *)buf + 4); | ||
693 | break; | 694 | break; |
694 | case 0xcb: | 695 | case 0xcb: |
695 | len -= 4; | 696 | len -= 4; |
@@ -1728,7 +1729,7 @@ static void ar9170_tx(struct ar9170 *ar) | |||
1728 | printk(KERN_DEBUG "%s: queue %d full\n", | 1729 | printk(KERN_DEBUG "%s: queue %d full\n", |
1729 | wiphy_name(ar->hw->wiphy), i); | 1730 | wiphy_name(ar->hw->wiphy), i); |
1730 | 1731 | ||
1731 | printk(KERN_DEBUG "%s: stuck frames: ===> \n", | 1732 | printk(KERN_DEBUG "%s: stuck frames: ===>\n", |
1732 | wiphy_name(ar->hw->wiphy)); | 1733 | wiphy_name(ar->hw->wiphy)); |
1733 | ar9170_dump_txqueue(ar, &ar->tx_pending[i]); | 1734 | ar9170_dump_txqueue(ar, &ar->tx_pending[i]); |
1734 | ar9170_dump_txqueue(ar, &ar->tx_status[i]); | 1735 | ar9170_dump_txqueue(ar, &ar->tx_status[i]); |
@@ -2512,7 +2513,7 @@ void *ar9170_alloc(size_t priv_size) | |||
2512 | * tends to split the streams into separate rx descriptors. | 2513 | * tends to split the streams into separate rx descriptors. |
2513 | */ | 2514 | */ |
2514 | 2515 | ||
2515 | skb = __dev_alloc_skb(AR9170_MAX_RX_BUFFER_SIZE, GFP_KERNEL); | 2516 | skb = __dev_alloc_skb(AR9170_RX_STREAM_MAX_SIZE, GFP_KERNEL); |
2516 | if (!skb) | 2517 | if (!skb) |
2517 | goto err_nomem; | 2518 | goto err_nomem; |
2518 | 2519 | ||