diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/recv.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c index 0eac27d56da7..c3129db7828f 100644 --- a/drivers/net/wireless/ath/ath9k/recv.c +++ b/drivers/net/wireless/ath/ath9k/recv.c | |||
@@ -662,8 +662,7 @@ static void ath_rx_ps(struct ath_softc *sc, struct sk_buff *skb) | |||
662 | } | 662 | } |
663 | 663 | ||
664 | static void ath_rx_send_to_mac80211(struct ieee80211_hw *hw, | 664 | static void ath_rx_send_to_mac80211(struct ieee80211_hw *hw, |
665 | struct ath_softc *sc, struct sk_buff *skb, | 665 | struct ath_softc *sc, struct sk_buff *skb) |
666 | struct ieee80211_rx_status *rxs) | ||
667 | { | 666 | { |
668 | struct ieee80211_hdr *hdr; | 667 | struct ieee80211_hdr *hdr; |
669 | 668 | ||
@@ -1621,7 +1620,7 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp) | |||
1621 | struct ath_hw *ah = sc->sc_ah; | 1620 | struct ath_hw *ah = sc->sc_ah; |
1622 | struct ath_common *common = ath9k_hw_common(ah); | 1621 | struct ath_common *common = ath9k_hw_common(ah); |
1623 | /* | 1622 | /* |
1624 | * The hw can techncically differ from common->hw when using ath9k | 1623 | * The hw can technically differ from common->hw when using ath9k |
1625 | * virtual wiphy so to account for that we iterate over the active | 1624 | * virtual wiphy so to account for that we iterate over the active |
1626 | * wiphys and find the appropriate wiphy and therefore hw. | 1625 | * wiphys and find the appropriate wiphy and therefore hw. |
1627 | */ | 1626 | */ |
@@ -1729,7 +1728,7 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp) | |||
1729 | bf->bf_mpdu = NULL; | 1728 | bf->bf_mpdu = NULL; |
1730 | bf->bf_buf_addr = 0; | 1729 | bf->bf_buf_addr = 0; |
1731 | ath_err(common, "dma_mapping_error() on RX\n"); | 1730 | ath_err(common, "dma_mapping_error() on RX\n"); |
1732 | ath_rx_send_to_mac80211(hw, sc, skb, rxs); | 1731 | ath_rx_send_to_mac80211(hw, sc, skb); |
1733 | break; | 1732 | break; |
1734 | } | 1733 | } |
1735 | 1734 | ||
@@ -1756,7 +1755,7 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp) | |||
1756 | if (ah->caps.hw_caps & ATH9K_HW_CAP_ANT_DIV_COMB) | 1755 | if (ah->caps.hw_caps & ATH9K_HW_CAP_ANT_DIV_COMB) |
1757 | ath_ant_comb_scan(sc, &rs); | 1756 | ath_ant_comb_scan(sc, &rs); |
1758 | 1757 | ||
1759 | ath_rx_send_to_mac80211(hw, sc, skb, rxs); | 1758 | ath_rx_send_to_mac80211(hw, sc, skb); |
1760 | 1759 | ||
1761 | requeue: | 1760 | requeue: |
1762 | if (edma) { | 1761 | if (edma) { |