aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBruno Randolf <br1@einfach.org>2010-06-16 06:12:07 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-06-16 14:59:04 -0400
commit2847109f73ac1b1e2d7517f9eac7f00c4e60b917 (patch)
treea392caefbfb07460076b6a1f29da6b95d9fddbd2 /drivers
parenta66681935455bfbb95dfe42aa3182e3f5b1ff1b4 (diff)
ath5k: cosmetic changes in ath5k_hw_proc_5212_rx_status()
Just whitespace and indentation. Signed-off-by: Bruno Randolf <br1@einfach.org> Acked-by: Bob Copeland <me@bobcopeland.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/ath/ath5k/desc.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath/ath5k/desc.c b/drivers/net/wireless/ath/ath5k/desc.c
index b5a5d45f2e82..50fc931fd398 100644
--- a/drivers/net/wireless/ath/ath5k/desc.c
+++ b/drivers/net/wireless/ath/ath5k/desc.c
@@ -577,7 +577,8 @@ static int ath5k_hw_proc_5210_rx_status(struct ath5k_hw *ah,
577 * Proccess the rx status descriptor on 5212 577 * Proccess the rx status descriptor on 5212
578 */ 578 */
579static int ath5k_hw_proc_5212_rx_status(struct ath5k_hw *ah, 579static int ath5k_hw_proc_5212_rx_status(struct ath5k_hw *ah,
580 struct ath5k_desc *desc, struct ath5k_rx_status *rs) 580 struct ath5k_desc *desc,
581 struct ath5k_rx_status *rs)
581{ 582{
582 struct ath5k_hw_rx_status *rx_status; 583 struct ath5k_hw_rx_status *rx_status;
583 struct ath5k_hw_rx_error *rx_err; 584 struct ath5k_hw_rx_error *rx_err;
@@ -589,7 +590,7 @@ static int ath5k_hw_proc_5212_rx_status(struct ath5k_hw *ah,
589 590
590 /* No frame received / not ready */ 591 /* No frame received / not ready */
591 if (unlikely(!(rx_status->rx_status_1 & 592 if (unlikely(!(rx_status->rx_status_1 &
592 AR5K_5212_RX_DESC_STATUS1_DONE))) 593 AR5K_5212_RX_DESC_STATUS1_DONE)))
593 return -EINPROGRESS; 594 return -EINPROGRESS;
594 595
595 /* 596 /*
@@ -615,7 +616,7 @@ static int ath5k_hw_proc_5212_rx_status(struct ath5k_hw *ah,
615 */ 616 */
616 if (rx_status->rx_status_1 & AR5K_5212_RX_DESC_STATUS1_KEY_INDEX_VALID) 617 if (rx_status->rx_status_1 & AR5K_5212_RX_DESC_STATUS1_KEY_INDEX_VALID)
617 rs->rs_keyix = AR5K_REG_MS(rx_status->rx_status_1, 618 rs->rs_keyix = AR5K_REG_MS(rx_status->rx_status_1,
618 AR5K_5212_RX_DESC_STATUS1_KEY_INDEX); 619 AR5K_5212_RX_DESC_STATUS1_KEY_INDEX);
619 else 620 else
620 rs->rs_keyix = AR5K_RXKEYIX_INVALID; 621 rs->rs_keyix = AR5K_RXKEYIX_INVALID;
621 622
@@ -623,7 +624,7 @@ static int ath5k_hw_proc_5212_rx_status(struct ath5k_hw *ah,
623 * Receive/descriptor errors 624 * Receive/descriptor errors
624 */ 625 */
625 if (!(rx_status->rx_status_1 & 626 if (!(rx_status->rx_status_1 &
626 AR5K_5212_RX_DESC_STATUS1_FRAME_RECEIVE_OK)) { 627 AR5K_5212_RX_DESC_STATUS1_FRAME_RECEIVE_OK)) {
627 if (rx_status->rx_status_1 & 628 if (rx_status->rx_status_1 &
628 AR5K_5212_RX_DESC_STATUS1_CRC_ERROR) 629 AR5K_5212_RX_DESC_STATUS1_CRC_ERROR)
629 rs->rs_status |= AR5K_RXERR_CRC; 630 rs->rs_status |= AR5K_RXERR_CRC;
@@ -644,7 +645,6 @@ static int ath5k_hw_proc_5212_rx_status(struct ath5k_hw *ah,
644 AR5K_5212_RX_DESC_STATUS1_MIC_ERROR) 645 AR5K_5212_RX_DESC_STATUS1_MIC_ERROR)
645 rs->rs_status |= AR5K_RXERR_MIC; 646 rs->rs_status |= AR5K_RXERR_MIC;
646 } 647 }
647
648 return 0; 648 return 0;
649} 649}
650 650