From f005435226414a03ef7c78383f4a80f22bed0d73 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 27 Feb 2012 19:58:40 +0100 Subject: [PATCH] --- yaml --- r: 291111 b: refs/heads/master c: 4286df60edfe19d3407fa112bf4bdfeeadda897c h: refs/heads/master i: 291109: 823ea2b60c0b2b1c666c24ad816317234b4a877f 291107: f907be4c17dac0e4c8fc18bacdd2d3e4f3a3f63c 291103: d5499d19ac2b2f2c38efde2e00d41361a0ff8090 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath9k/main.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 70f4d94de308..5ff750b911b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d6157bf78015e53371e806e0f8fd44ef6a1bfc5d +refs/heads/master: 4286df60edfe19d3407fa112bf4bdfeeadda897c diff --git a/trunk/drivers/net/wireless/ath/ath9k/main.c b/trunk/drivers/net/wireless/ath/ath9k/main.c index 02e95c8e7465..cc2535c38bed 100644 --- a/trunk/drivers/net/wireless/ath/ath9k/main.c +++ b/trunk/drivers/net/wireless/ath/ath9k/main.c @@ -2300,6 +2300,7 @@ static int ath9k_tx_last_beacon(struct ieee80211_hw *hw) struct ath_vif *avp; struct ath_buf *bf; struct ath_tx_status ts; + bool edma = !!(ah->caps.hw_caps & ATH9K_HW_CAP_EDMA); int status; vif = sc->beacon.bslot[0]; @@ -2310,7 +2311,7 @@ static int ath9k_tx_last_beacon(struct ieee80211_hw *hw) if (!avp->is_bslot_active) return 0; - if (!sc->beacon.tx_processed) { + if (!sc->beacon.tx_processed && !edma) { tasklet_disable(&sc->bcon_tasklet); bf = avp->av_bcbuf;