Author: adrian
Date: Fri Jul 27 11:23:24 2012
New Revision: 238838
URL: http://svn.freebsd.org/changeset/base/238838
Log:
Bring this API in line with what the reference driver and Linux ath9k
was doing.
Obtained from: Qualcomm Atheros, Linux ath9k
Modified:
head/sys/dev/ath/ath_hal/ah.h
head/sys/dev/ath/ath_hal/ar5416/ar5416.h
head/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c
head/sys/dev/ath/if_athvar.h
Modified: head/sys/dev/ath/ath_hal/ah.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ah.h Fri Jul 27 10:52:21 2012
(r238837)
+++ head/sys/dev/ath/ath_hal/ah.h Fri Jul 27 11:23:24 2012
(r238838)
@@ -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 *,
Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5416/ar5416.h Fri Jul 27 10:52:21 2012
(r238837)
+++ head/sys/dev/ath/ath_hal/ar5416/ar5416.h Fri Jul 27 11:23:24 2012
(r238838)
@@ -387,7 +387,7 @@ extern void ar5416Set11nRateScenario(str
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);
Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c Fri Jul 27 10:52:21
2012 (r238837)
+++ head/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c Fri Jul 27 11:23:24
2012 (r238838)
@@ -727,16 +727,14 @@ ar5416Set11nRateScenario(struct ath_hal
}
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
Modified: head/sys/dev/ath/if_athvar.h
==============================================================================
--- head/sys/dev/ath/if_athvar.h Fri Jul 27 10:52:21 2012
(r238837)
+++ head/sys/dev/ath/if_athvar.h Fri Jul 27 11:23:24 2012
(r238838)
@@ -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) \
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
