The commit "ath9k_hw: Fix exceed transmission burst-time of 5GHz" added
a padding of 60 delimiters on the first subframe to work around an issue
on AR9380, but it lacked the checks to prevent it from being applied to
pre-AR9380, enterprise AR9380 or AR9580+
Signed-off-by: Felix Fietkau <[email protected]>
Cc: Rajkumar Manoharan <[email protected]>
---
drivers/net/wireless/ath/ath9k/reg.h | 1 +
drivers/net/wireless/ath/ath9k/xmit.c | 4 +++-
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wireless/ath/ath9k/reg.h b/drivers/net/wireless/ath/ath9k/reg.h
index a3b8bbc..989514a 100644
--- a/drivers/net/wireless/ath/ath9k/reg.h
+++ b/drivers/net/wireless/ath/ath9k/reg.h
@@ -1131,6 +1131,7 @@ enum {
#define AR_INTR_PRIO_ASYNC_ENABLE (AR_SREV_9340(ah) ? 0x4094 : 0x40d4)
#define AR_ENT_OTP 0x40d8
#define AR_ENT_OTP_CHAIN2_DISABLE 0x00020000
+#define AR_ENT_OTP_MIN_PKT_SIZE_DISABLE 0x00800000
#define AR_ENT_OTP_MPSD 0x00800000
#define AR_CH0_BB_DPLL1 0x16180
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 5e29829..ad3fcd2 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -692,7 +692,9 @@ static int ath_compute_num_delims(struct ath_softc *sc, struct ath_atx_tid *tid,
* Add delimiter when using RTS/CTS with aggregation
* and non enterprise AR9003 card
*/
- if (first_subfrm)
+ if (first_subfrm && (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) &&
+ !AR_SREV_9580_10_OR_LATER(sc->sc_ah) &&
+ (sc->sc_ah->ent_mode & AR_ENT_OTP_MIN_PKT_SIZE_DISABLE))
ndelim = max(ndelim, FIRST_DESC_NDELIMS);
/*
--
1.7.3.2
On Mon, Aug 29, 2011 at 12:51:01PM +0200, Felix Fietkau wrote:
> The commit "ath9k_hw: Fix exceed transmission burst-time of 5GHz" added
> a padding of 60 delimiters on the first subframe to work around an issue
> on AR9380, but it lacked the checks to prevent it from being applied to
> pre-AR9380, enterprise AR9380 or AR9580+
>
> Signed-off-by: Felix Fietkau <[email protected]>
> Cc: Rajkumar Manoharan <[email protected]>
> ---
> drivers/net/wireless/ath/ath9k/reg.h | 1 +
> drivers/net/wireless/ath/ath9k/xmit.c | 4 +++-
> 2 files changed, 4 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath9k/reg.h b/drivers/net/wireless/ath/ath9k/reg.h
> index a3b8bbc..989514a 100644
> --- a/drivers/net/wireless/ath/ath9k/reg.h
> +++ b/drivers/net/wireless/ath/ath9k/reg.h
> @@ -1131,6 +1131,7 @@ enum {
> #define AR_INTR_PRIO_ASYNC_ENABLE (AR_SREV_9340(ah) ? 0x4094 : 0x40d4)
> #define AR_ENT_OTP 0x40d8
> #define AR_ENT_OTP_CHAIN2_DISABLE 0x00020000
> +#define AR_ENT_OTP_MIN_PKT_SIZE_DISABLE 0x00800000
> #define AR_ENT_OTP_MPSD 0x00800000
Looks like AR_ENT_OTP_MPSD was defined for this purpose,
unfortunately it so difficult to understand anything from this
macro. Can you also this redundant definition?
Vasanth
On Mon, Aug 29, 2011 at 04:34:28PM +0530, Vasanthakumar Thiagarajan wrote:
> On Mon, Aug 29, 2011 at 12:51:01PM +0200, Felix Fietkau wrote:
> > The commit "ath9k_hw: Fix exceed transmission burst-time of 5GHz" added
> > a padding of 60 delimiters on the first subframe to work around an issue
> > on AR9380, but it lacked the checks to prevent it from being applied to
> > pre-AR9380, enterprise AR9380 or AR9580+
> >
> > Signed-off-by: Felix Fietkau <[email protected]>
> > Cc: Rajkumar Manoharan <[email protected]>
> > ---
> > drivers/net/wireless/ath/ath9k/reg.h | 1 +
> > drivers/net/wireless/ath/ath9k/xmit.c | 4 +++-
> > 2 files changed, 4 insertions(+), 1 deletions(-)
> >
> > diff --git a/drivers/net/wireless/ath/ath9k/reg.h b/drivers/net/wireless/ath/ath9k/reg.h
> > index a3b8bbc..989514a 100644
> > --- a/drivers/net/wireless/ath/ath9k/reg.h
> > +++ b/drivers/net/wireless/ath/ath9k/reg.h
> > @@ -1131,6 +1131,7 @@ enum {
> > #define AR_INTR_PRIO_ASYNC_ENABLE (AR_SREV_9340(ah) ? 0x4094 : 0x40d4)
> > #define AR_ENT_OTP 0x40d8
> > #define AR_ENT_OTP_CHAIN2_DISABLE 0x00020000
> > +#define AR_ENT_OTP_MIN_PKT_SIZE_DISABLE 0x00800000
> > #define AR_ENT_OTP_MPSD 0x00800000
>
> Looks like AR_ENT_OTP_MPSD was defined for this purpose,
> unfortunately it so difficult to understand anything from this
> macro. Can you also this redundant definition?
I mean, Can you also remove this redundant definition?, thanks.
Vasanth