ar9170usb: atomic pending urbs counter
PATCH 2/3 ar9170usb: atomic pending urbs counter
This patch follows "ar9170: atomic pending A-MPDU counter" idea and converts another critical counter to atomic_*.
Signed-off-by Christian Lamparter <[email protected]>
---
drivers/net/wireless/ath/ar9170/usb.c +6 -6
@@ -108,15 +108,15 @@ static void ar9170_usb_submit_urb(struct ar9170_usb *aru)return ;spin_lock_irqsave (&aru->tx_urb_lock, flags); -if (aru->tx_submitted_urbs >=AR9170_NUM_TX_URBS ) { +if (atomic_read (&aru->tx_submitted_urbs) >=AR9170_NUM_TX_URBS ) {spin_unlock_irqrestore (&aru->tx_urb_lock, flags);return ; } - aru->tx_submitted_urbs++; +atomic_inc (&aru->tx_submitted_urbs); urb =usb_get_from_anchor (&aru->tx_pending);if (!urb) { - aru->tx_submitted_urbs--; +atomic_dec (&aru->tx_submitted_urbs);spin_unlock_irqrestore (&aru->tx_urb_lock, flags);return ;
@@ -133,7 +133,7 @@ static void ar9170_usb_submit_urb(struct ar9170_usb *aru) err);usb_unanchor_urb (urb); - aru->tx_submitted_urbs--; +atomic_dec (&aru->tx_submitted_urbs);ar9170_tx_callback (&aru->common, urb->context); }
@@ -151,7 +151,7 @@ static void ar9170_usb_tx_urb_complete_frame(struct urb *urb)return ; } - aru->tx_submitted_urbs--; +atomic_dec (&aru->tx_submitted_urbs);ar9170_tx_callback (&aru->common, skb);
@@ -794,7 +794,7 @@ static int ar9170_usb_probe(struct usb_interface *intf,spin_lock_init (&aru->tx_urb_lock); aru->tx_pending_urbs =0 ; - aru->tx_submitted_urbs =0 ; +atomic_set (&aru->tx_submitted_urbs,0 ); aru->common.stop = ar9170_usb_stop; aru->common.flush = ar9170_usb_flush;
drivers/net/wireless/ath/ar9170/usb.h +1 -1
@@ -67,7 +67,7 @@ struct ar9170_usb {bool req_one_stage_fw;spinlock_t tx_urb_lock; -unsigned int tx_submitted_urbs; +atomic_t tx_submitted_urbs;unsigned int tx_pending_urbs;struct completion cmd_wait;