diff options
| author | adrian <adrian@FreeBSD.org> | 2012-07-27 11:23:24 +0000 |
|---|---|---|
| committer | adrian <adrian@FreeBSD.org> | 2012-07-27 11:23:24 +0000 |
| commit | df2495f2ffb1e49b3a3f76063f26fb4deb955954 (patch) | |
| tree | 0fc64e9f9d8ad16740fd7e07e4bd1facfd798ae9 | |
| parent | 1d0bf54c2a23bd79b79572ecc485c7eee9c6c157 (diff) | |
| download | FreeBSD-src-df2495f2ffb1e49b3a3f76063f26fb4deb955954.zip FreeBSD-src-df2495f2ffb1e49b3a3f76063f26fb4deb955954.tar.gz | |
Bring this API in line with what the reference driver and Linux ath9k
was doing.
Obtained from: Qualcomm Atheros, Linux ath9k
| -rw-r--r-- | sys/dev/ath/ath_hal/ah.h | 2 | ||||
| -rw-r--r-- | sys/dev/ath/ath_hal/ar5416/ar5416.h | 2 | ||||
| -rw-r--r-- | sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c | 6 | ||||
| -rw-r--r-- | sys/dev/ath/if_athvar.h | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/sys/dev/ath/ath_hal/ah.h b/sys/dev/ath/ath_hal/ah.h index c9e0f63..016d060 100644 --- a/sys/dev/ath/ath_hal/ah.h +++ b/sys/dev/ath/ath_hal/ah.h @@ -1233,7 +1233,7 @@ struct ath_hal { struct ath_desc *, u_int, u_int, HAL_11N_RATE_SERIES [], u_int, u_int); void __ahdecl(*ah_set11nAggrFirst)(struct ath_hal *, - struct ath_desc *, u_int, u_int); + struct ath_desc *, u_int); void __ahdecl(*ah_set11nAggrMiddle)(struct ath_hal *, struct ath_desc *, u_int); void __ahdecl(*ah_set11nAggrLast)(struct ath_hal *, diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416.h b/sys/dev/ath/ath_hal/ar5416/ar5416.h index 5a0e7ef..75cd3df 100644 --- a/sys/dev/ath/ath_hal/ar5416/ar5416.h +++ b/sys/dev/ath/ath_hal/ar5416/ar5416.h @@ -387,7 +387,7 @@ extern void ar5416Set11nRateScenario(struct ath_hal *ah, struct ath_desc *ds, u_int nseries, u_int flags); extern void ar5416Set11nAggrFirst(struct ath_hal *ah, struct ath_desc *ds, - u_int aggrLen, u_int numDelims); + u_int aggrLen); extern void ar5416Set11nAggrMiddle(struct ath_hal *ah, struct ath_desc *ds, u_int numDelims); extern void ar5416Set11nAggrLast(struct ath_hal *ah, struct ath_desc *ds); diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c b/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c index e33a55d..64a4e65 100644 --- a/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c +++ b/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c @@ -727,16 +727,14 @@ ar5416Set11nRateScenario(struct ath_hal *ah, struct ath_desc *ds, } void -ar5416Set11nAggrFirst(struct ath_hal *ah, struct ath_desc *ds, - u_int aggrLen, u_int numDelims) +ar5416Set11nAggrFirst(struct ath_hal *ah, struct ath_desc *ds, u_int aggrLen) { struct ar5416_desc *ads = AR5416DESC(ds); ads->ds_ctl1 |= (AR_IsAggr | AR_MoreAggr); ads->ds_ctl6 &= ~(AR_AggrLen | AR_PadDelim); - ads->ds_ctl6 |= SM(aggrLen, AR_AggrLen) | - SM(numDelims, AR_PadDelim); + ads->ds_ctl6 |= SM(aggrLen, AR_AggrLen); } void diff --git a/sys/dev/ath/if_athvar.h b/sys/dev/ath/if_athvar.h index 932ce34..e6edb6b 100644 --- a/sys/dev/ath/if_athvar.h +++ b/sys/dev/ath/if_athvar.h @@ -1121,7 +1121,7 @@ void ath_intr(void *); (_series), (_ns), (_flags))) #define ath_hal_set11n_aggr_first(_ah, _ds, _len, _num) \ - ((*(_ah)->ah_set11nAggrFirst)((_ah), (_ds), (_len), (_num))) + ((*(_ah)->ah_set11nAggrFirst)((_ah), (_ds), (_len))) #define ath_hal_set11naggrmiddle(_ah, _ds, _num) \ ((*(_ah)->ah_set11nAggrMiddle)((_ah), (_ds), (_num))) #define ath_hal_set11n_aggr_last(_ah, _ds) \ |
