mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-02-17 15:54:43 +02:00
ath9k: merge fixes from r25204, r25205
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@25206 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
6850d22cf4
commit
b708a83af4
@ -88,6 +88,16 @@
|
|||||||
void ath_debug_stat_rx(struct ath_softc *sc, struct ath_rx_status *rs);
|
void ath_debug_stat_rx(struct ath_softc *sc, struct ath_rx_status *rs);
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
@@ -192,7 +192,8 @@ static inline void ath_debug_stat_interr
|
||||||
|
|
||||||
|
static inline void ath_debug_stat_tx(struct ath_softc *sc,
|
||||||
|
struct ath_buf *bf,
|
||||||
|
- struct ath_tx_status *ts)
|
||||||
|
+ struct ath_tx_status *ts,
|
||||||
|
+ struct ath_txq *txq)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
--- a/drivers/net/wireless/ath/ath9k/xmit.c
|
--- a/drivers/net/wireless/ath/ath9k/xmit.c
|
||||||
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
|
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
|
||||||
@@ -1913,7 +1913,7 @@ static void ath_tx_complete_buf(struct a
|
@@ -1913,7 +1913,7 @@ static void ath_tx_complete_buf(struct a
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
sc->sc_flags &= ~SC_OP_RXFLUSH;
|
sc->sc_flags &= ~SC_OP_RXFLUSH;
|
||||||
spin_lock_init(&sc->rx.rxbuflock);
|
spin_lock_init(&sc->rx.rxbuflock);
|
||||||
|
|
||||||
+ common->rx_bufsize = IEEE80211_MAX_MPDU_LEN / 2 + common->cachelsz +
|
+ common->rx_bufsize = IEEE80211_MAX_MPDU_LEN / 2 +
|
||||||
+ sc->sc_ah->caps.rx_status_len;
|
+ sc->sc_ah->caps.rx_status_len;
|
||||||
+
|
+
|
||||||
if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) {
|
if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user