Commit 1e875e9f authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville

ath9k: rename ath_rx_prepare() to ath9k_rx_skb_preprocess()

And change the return value to something more obvious.
Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 2c74aa4d
...@@ -288,16 +288,17 @@ static void ath9k_process_rssi(struct ath_common *common, ...@@ -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 * 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. * decryption key or real decryption error. This let us keep statistics there.
*/ */
static int ath_rx_prepare(struct ath_common *common, static int ath9k_rx_skb_preprocess(struct ath_common *common,
struct ieee80211_hw *hw, struct ieee80211_hw *hw,
struct sk_buff *skb, struct ath_rx_status *rx_stats, struct sk_buff *skb,
struct ieee80211_rx_status *rx_status, struct ath_rx_status *rx_stats,
bool *decrypt_error) struct ieee80211_rx_status *rx_status,
bool *decrypt_error)
{ {
struct ath_hw *ah = common->ah; struct ath_hw *ah = common->ah;
if (!ath9k_rx_accept(common, skb, rx_status, rx_stats, decrypt_error)) 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); ath9k_process_rssi(common, hw, skb, rx_stats);
...@@ -312,8 +313,6 @@ static int ath_rx_prepare(struct ath_common *common, ...@@ -312,8 +313,6 @@ static int ath_rx_prepare(struct ath_common *common,
rx_status->qual = ath9k_compute_qual(hw, rx_stats); rx_status->qual = ath9k_compute_qual(hw, rx_stats);
rx_status->flag |= RX_FLAG_TSFT; rx_status->flag |= RX_FLAG_TSFT;
return 1;
rx_next:
return 0; return 0;
} }
...@@ -808,8 +807,9 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush) ...@@ -808,8 +807,9 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush)
if (flush) if (flush)
goto requeue; goto requeue;
if (!ath_rx_prepare(common, hw, skb, rx_stats, retval = ath9k_rx_skb_preprocess(common, hw, skb, rx_stats,
rxs, &decrypt_error)) rxs, &decrypt_error);
if (retval)
goto requeue; goto requeue;
/* Ensure we always have an skb to requeue once we are done /* Ensure we always have an skb to requeue once we are done
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment