aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/wireless/ath
diff options
context:
space:
mode:
authorLuis R. Rodriguez <lrodriguez@atheros.com>2009-11-04 16:34:33 -0800
committerJohn W. Linville <linville@tuxdriver.com>2009-11-11 17:09:08 -0500
commit1e875e9f16e3138d0e23cbf806a6d9520b622db2 (patch)
tree6957e6c42c0bbc16f0bb9d7f689c9c0c8da3fbb1 /drivers/net/wireless/ath
parent2c74aa4d73dbed2e879e7eb5ee9de95d40e5298d (diff)
ath9k: rename ath_rx_prepare() to ath9k_rx_skb_preprocess()
And change the return value to something more obvious. Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath')
-rw-r--r--drivers/net/wireless/ath/ath9k/recv.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c
index 16ed9292c80..c4a8663af3f 100644
--- a/drivers/net/wireless/ath/ath9k/recv.c
+++ b/drivers/net/wireless/ath/ath9k/recv.c
@@ -288,16 +288,17 @@ static void ath9k_process_rssi(struct ath_common *common,
* up the frame up to let mac80211 handle the actual error case, be it no
* decryption key or real decryption error. This let us keep statistics there.
*/
-static int ath_rx_prepare(struct ath_common *common,
- struct ieee80211_hw *hw,
- struct sk_buff *skb, struct ath_rx_status *rx_stats,
- struct ieee80211_rx_status *rx_status,
- bool *decrypt_error)
+static int ath9k_rx_skb_preprocess(struct ath_common *common,
+ struct ieee80211_hw *hw,
+ struct sk_buff *skb,
+ struct ath_rx_status *rx_stats,
+ struct ieee80211_rx_status *rx_status,
+ bool *decrypt_error)
{
struct ath_hw *ah = common->ah;
if (!ath9k_rx_accept(common, skb, rx_status, rx_stats, decrypt_error))
- goto rx_next;
+ return -EINVAL;
ath9k_process_rssi(common, hw, skb, rx_stats);
@@ -312,8 +313,6 @@ static int ath_rx_prepare(struct ath_common *common,
rx_status->qual = ath9k_compute_qual(hw, rx_stats);
rx_status->flag |= RX_FLAG_TSFT;
- return 1;
-rx_next:
return 0;
}
@@ -808,8 +807,9 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush)
if (flush)
goto requeue;
- if (!ath_rx_prepare(common, hw, skb, rx_stats,
- rxs, &decrypt_error))
+ retval = ath9k_rx_skb_preprocess(common, hw, skb, rx_stats,
+ rxs, &decrypt_error);
+ if (retval)
goto requeue;
/* Ensure we always have an skb to requeue once we are done