ath9k: Convert ANI channel to a pointer
This patch converts the ANI channel reference to a pointer, this facilitates moving struct ar5416AniState to ani.h Signed-off-by: Sujith <Sujith.Manoharan@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
394cf0a1ca
commit
ee6e8d1c23
|
@ -23,11 +23,11 @@ static int ath9k_hw_get_ani_channel_idx(struct ath_hal *ah,
|
|||
int i;
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(ahp->ah_ani); i++) {
|
||||
if (ahp->ah_ani[i].c.channel == chan->channel)
|
||||
if (ahp->ah_ani[i].c &&
|
||||
ahp->ah_ani[i].c->channel == chan->channel)
|
||||
return i;
|
||||
if (ahp->ah_ani[i].c.channel == 0) {
|
||||
ahp->ah_ani[i].c.channel = chan->channel;
|
||||
ahp->ah_ani[i].c.channelFlags = chan->channelFlags;
|
||||
if (ahp->ah_ani[i].c == NULL) {
|
||||
ahp->ah_ani[i].c = chan;
|
||||
return i;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -72,6 +72,33 @@ struct ath9k_node_stats {
|
|||
u32 ns_avgtxrate;
|
||||
};
|
||||
|
||||
struct ar5416AniState {
|
||||
struct ath9k_channel *c;
|
||||
u8 noiseImmunityLevel;
|
||||
u8 spurImmunityLevel;
|
||||
u8 firstepLevel;
|
||||
u8 ofdmWeakSigDetectOff;
|
||||
u8 cckWeakSigThreshold;
|
||||
u32 listenTime;
|
||||
u32 ofdmTrigHigh;
|
||||
u32 ofdmTrigLow;
|
||||
int32_t cckTrigHigh;
|
||||
int32_t cckTrigLow;
|
||||
int32_t rssiThrLow;
|
||||
int32_t rssiThrHigh;
|
||||
u32 noiseFloor;
|
||||
u32 txFrameCount;
|
||||
u32 rxFrameCount;
|
||||
u32 cycleCount;
|
||||
u32 ofdmPhyErrCount;
|
||||
u32 cckPhyErrCount;
|
||||
u32 ofdmPhyErrBase;
|
||||
u32 cckPhyErrBase;
|
||||
int16_t pktRssi[2];
|
||||
int16_t ofdmErrRssi[2];
|
||||
int16_t cckErrRssi[2];
|
||||
};
|
||||
|
||||
struct ar5416Stats {
|
||||
u32 ast_ani_niup;
|
||||
u32 ast_ani_nidown;
|
||||
|
|
|
@ -406,33 +406,6 @@ enum {
|
|||
ATH9K_RESET_COLD,
|
||||
};
|
||||
|
||||
struct ar5416AniState {
|
||||
struct ath9k_channel c;
|
||||
u8 noiseImmunityLevel;
|
||||
u8 spurImmunityLevel;
|
||||
u8 firstepLevel;
|
||||
u8 ofdmWeakSigDetectOff;
|
||||
u8 cckWeakSigThreshold;
|
||||
u32 listenTime;
|
||||
u32 ofdmTrigHigh;
|
||||
u32 ofdmTrigLow;
|
||||
int32_t cckTrigHigh;
|
||||
int32_t cckTrigLow;
|
||||
int32_t rssiThrLow;
|
||||
int32_t rssiThrHigh;
|
||||
u32 noiseFloor;
|
||||
u32 txFrameCount;
|
||||
u32 rxFrameCount;
|
||||
u32 cycleCount;
|
||||
u32 ofdmPhyErrCount;
|
||||
u32 cckPhyErrCount;
|
||||
u32 ofdmPhyErrBase;
|
||||
u32 cckPhyErrBase;
|
||||
int16_t pktRssi[2];
|
||||
int16_t ofdmErrRssi[2];
|
||||
int16_t cckErrRssi[2];
|
||||
};
|
||||
|
||||
struct ath_hal {
|
||||
u32 ah_magic;
|
||||
u16 ah_devid;
|
||||
|
|
Loading…
Reference in a new issue