Currently we are passing MODE_ATHEROS_TURBO or MODE_ATHEROS_TURBOG to
ath5k_hw_get_rate_table if ah_version is AR5K_AR5212 and the channel
passed to ath5k_hw_reset is not a B channel. This is a problem if
for no other reason than we are not registering those channels.
Signed-off-by: John W. Linville <[email protected]>
---
This is untested. Does this look like the right fix?
Also, just above the change is the comment "For 802.11a/g Turbo/XR mode
(AR5K_MODE_XR here is O.K. for both a/g - OFDM)". Is this the right
comment?
drivers/net/wireless/ath5k/hw.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/ath5k/hw.c b/drivers/net/wireless/ath5k/hw.c
index c8d1fbd..a31443e 100644
--- a/drivers/net/wireless/ath5k/hw.c
+++ b/drivers/net/wireless/ath5k/hw.c
@@ -695,8 +695,7 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum ieee80211_if_types op_mode,
/* Get rate table for this operation mode */
rt = ath5k_hw_get_rate_table(ah,
- channel->val & CHANNEL_TURBO ?
- MODE_ATHEROS_TURBO : MODE_ATHEROS_TURBOG);
+ MODE_IEEE80211G);
if (!rt)
return -EINVAL;
--
1.5.3.3
2007/10/31, John W. Linville <[email protected]>:
> Currently we are passing MODE_ATHEROS_TURBO or MODE_ATHEROS_TURBOG to
> ath5k_hw_get_rate_table if ah_version is AR5K_AR5212 and the channel
> passed to ath5k_hw_reset is not a B channel. This is a problem if
> for no other reason than we are not registering those channels.
>
> Signed-off-by: John W. Linville <[email protected]>
> ---
> This is untested. Does this look like the right fix?
>
> Also, just above the change is the comment "For 802.11a/g Turbo/XR mode
> (AR5K_MODE_XR here is O.K. for both a/g - OFDM)". Is this the right
> comment?
>
> drivers/net/wireless/ath5k/hw.c | 3 +--
> 1 files changed, 1 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/ath5k/hw.c b/drivers/net/wireless/ath5k/hw.c
> index c8d1fbd..a31443e 100644
> --- a/drivers/net/wireless/ath5k/hw.c
> +++ b/drivers/net/wireless/ath5k/hw.c
> @@ -695,8 +695,7 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum ieee80211_if_types op_mode,
>
> /* Get rate table for this operation mode */
> rt = ath5k_hw_get_rate_table(ah,
> - channel->val & CHANNEL_TURBO ?
> - MODE_ATHEROS_TURBO : MODE_ATHEROS_TURBOG);
> + MODE_IEEE80211G);
> if (!rt)
> return -EINVAL;
>
> --
> 1.5.3.3
>
>
On madwif-old-openhal we had MODE_XR which is a special (proprietary)
mode and returns a special rate table, during porting this bit was
misunderstood and xr was changed with turbog. Any one of a/g/xr rate
tables would do here i believe (all we want is a rate table with
MODULATION_OFDM and the right values in kbps -which are common for
a/g- so that computetxtime is ok with it), we prefer xr rate table so
that rate duration is also written for xr rates.
We also have to fix ath5k_hw_get_rate_table because it returns xr rate
table for turbog mode and xr has nothing to do with it (it operates on
5Ghz), TURBO table is ok for both turboa/turbog modes (that's why
MODE_ATHEROS_TURBO is ok there and shouldn't be removed -rate duration
table is different for turbo modes, they have MODULATION_TURBO and
computetxtime behaves differently-).
I believe we should define MODE_XR as we defined TURBOG internally and
do the same thing we did on madwifi-old-openhal.
As for the comment it says:
/* For 802.11a/g Turbo/XR mode (AR5K_MODE_XR here is
* O.K. for both a/g - OFDM) */
so for a/g and xr we use XR rate table and for turboa/turbog we use
TURBO rate table. If it's misleading plz change it to something
better.
--
GPG ID: 0xD21DB2DB
As you read this post global entropy rises. Have Fun ;-)
Nick
On 10/31/07, Nick Kossifidis <[email protected]> wrote:
> 2007/10/31, John W. Linville <[email protected]>:
> > Currently we are passing MODE_ATHEROS_TURBO or MODE_ATHEROS_TURBOG to
> > ath5k_hw_get_rate_table if ah_version is AR5K_AR5212 and the channel
> > passed to ath5k_hw_reset is not a B channel. This is a problem if
> > for no other reason than we are not registering those channels.
> >
> > Signed-off-by: John W. Linville <[email protected]>
> > ---
> > This is untested. Does this look like the right fix?
> >
> > Also, just above the change is the comment "For 802.11a/g Turbo/XR mode
> > (AR5K_MODE_XR here is O.K. for both a/g - OFDM)". Is this the right
> > comment?
> >
> > drivers/net/wireless/ath5k/hw.c | 3 +--
> > 1 files changed, 1 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/net/wireless/ath5k/hw.c b/drivers/net/wireless/ath5k/hw.c
> > index c8d1fbd..a31443e 100644
> > --- a/drivers/net/wireless/ath5k/hw.c
> > +++ b/drivers/net/wireless/ath5k/hw.c
> > @@ -695,8 +695,7 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum ieee80211_if_types op_mode,
> >
> > /* Get rate table for this operation mode */
> > rt = ath5k_hw_get_rate_table(ah,
> > - channel->val & CHANNEL_TURBO ?
> > - MODE_ATHEROS_TURBO : MODE_ATHEROS_TURBOG);
> > + MODE_IEEE80211G);
> > if (!rt)
> > return -EINVAL;
> >
> > --
> > 1.5.3.3
> >
> >
>
> On madwif-old-openhal we had MODE_XR which is a special (proprietary)
> mode and returns a special rate table, during porting this bit was
> misunderstood and xr was changed with turbog. Any one of a/g/xr rate
> tables would do here i believe (all we want is a rate table with
> MODULATION_OFDM and the right values in kbps -which are common for
> a/g- so that computetxtime is ok with it), we prefer xr rate table so
> that rate duration is also written for xr rates.
>
> We also have to fix ath5k_hw_get_rate_table because it returns xr rate
> table for turbog mode and xr has nothing to do with it (it operates on
> 5Ghz), TURBO table is ok for both turboa/turbog modes (that's why
> MODE_ATHEROS_TURBO is ok there and shouldn't be removed -rate duration
> table is different for turbo modes, they have MODULATION_TURBO and
> computetxtime behaves differently-).
>
> I believe we should define MODE_XR as we defined TURBOG internally and
> do the same thing we did on madwifi-old-openhal.
>
> As for the comment it says:
>
> /* For 802.11a/g Turbo/XR mode (AR5K_MODE_XR here is
> * O.K. for both a/g - OFDM) */
>
> so for a/g and xr we use XR rate table and for turboa/turbog we use
> TURBO rate table. If it's misleading plz change it to something
> better.
Actually this caused by a bug I had sent a primer fix to ath5k-devel a
while back. Let me just post these patches as they're long due... I'll
post the rework of rates stuff I have been working on later.. This
just needs to get fixed ASAP.
Luis