On 2010-11-15 12:27 PM, Vasanthakumar Thiagarajan wrote: > On Sun, Nov 14, 2010 at 07:50:11PM +0530, Felix Fietkau wrote: >> This makes further tx path cleanups easier >> >> Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx> >> --- >> drivers/net/wireless/ath/ath9k/main.c | 3 +++ >> 1 files changed, 3 insertions(+), 0 deletions(-) >> >> diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c >> index 8464ca3..50bdb5d 100644 >> --- a/drivers/net/wireless/ath/ath9k/main.c >> +++ b/drivers/net/wireless/ath/ath9k/main.c >> @@ -1992,6 +1992,9 @@ static int ath9k_ampdu_action(struct ieee80211_hw *hw, >> case IEEE80211_AMPDU_RX_STOP: >> break; >> case IEEE80211_AMPDU_TX_START: >> + if (!(sc->sc_flags & SC_OP_TXAGGR)) >> + return -EOPNOTSUPP; > > SC_OP_TXAGGR is set when the hw supports tx AMPDU, I think > mac80211 does not call drv_ampdu_action() if hw does not > support AMPDU. You're right, I took another look at the code and while AMPDU is not disabled based on SC_OP_TXAGGR, it is disabled based on the same condition that gets checked before SC_OP_TXAGGR is even set. Maybe I'll clean that up later... - Felix -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
