From: Sujith Manoharan <[email protected]>
Commit "ath9k_hw: move AR9280 PCI EEPROM fix to eeprom_def.c"
changed the behavior of INI overriding which is needed only
for PCI cards. Revert to the original check.
Signed-off-by: Sujith Manoharan <[email protected]>
---
drivers/net/wireless/ath/ath9k/eeprom_def.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_def.c b/drivers/net/wireless/ath/ath9k/eeprom_def.c
index c9318ff..fccd87d 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom_def.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom_def.c
@@ -247,9 +247,9 @@ static int ath9k_hw_def_check_eeprom(struct ath_hw *ah)
}
/* Enable fixup for AR_AN_TOP2 if necessary */
- if (AR_SREV_9280_20_OR_LATER(ah) &&
- (eep->baseEepHeader.version & 0xff) > 0x0a &&
- eep->baseEepHeader.pwdclkind == 0)
+ if ((ah->hw_version.devid == AR9280_DEVID_PCI) &&
+ ((eep->baseEepHeader.version & 0xff) > 0x0a) &&
+ (eep->baseEepHeader.pwdclkind == 0))
ah->need_an_top2_fixup = 1;
if ((common->bus_ops->ath_bus_type == ATH_USB) &&
--
1.7.3.5
On Wed, Jan 26, 2011 at 9:28 AM, Sujith <[email protected]> wrote:
> Luis R. Rodriguez wrote:
>> On Wed, Jan 26, 2011 at 8:29 AM, Sujith <[email protected]> wrote:
>> > From: Sujith Manoharan <[email protected]>
>> >
>> > Commit "ath9k_hw: move AR9280 PCI EEPROM fix to eeprom_def.c"
>> > changed the behavior of INI overriding which is needed only
>> > for PCI cards. Revert to the original check.
>> >
>> > Signed-off-by: Sujith Manoharan <[email protected]>
>>
>> You leave me no option but to come out of e-mail reply slumber. What
>> issues was this causing?
>
> The INI fixup is required only for AR9280 PCI cards. Changing it to a SREV
> check that includes all chipsets above AR9280 would mean changing the initvals
> for other cards too. The couple of cards I have did not hit this check,
> but that doesn't mean that there are no weirdly configured cards out there...
Thanks, the reason I ask was to determine if this was a stable fix.
mcgrof@tux ~/linux-2.6-allstable (git::master)$ git describe
--contains 57b98384e5450996300d77ece61739b58325a84f
v2.6.35-rc1~473^2~167^2~208
Luis
On Wed, Jan 26, 2011 at 8:29 AM, Sujith <[email protected]> wrote:
> From: Sujith Manoharan <[email protected]>
>
> Commit "ath9k_hw: move AR9280 PCI EEPROM fix to eeprom_def.c"
> changed the behavior of INI overriding which is needed only
> for PCI cards. Revert to the original check.
>
> Signed-off-by: Sujith Manoharan <[email protected]>
You leave me no option but to come out of e-mail reply slumber. What
issues was this causing?
Luis
Luis R. Rodriguez wrote:
> On Wed, Jan 26, 2011 at 8:29 AM, Sujith <[email protected]> wrote:
> > From: Sujith Manoharan <[email protected]>
> >
> > Commit "ath9k_hw: move AR9280 PCI EEPROM fix to eeprom_def.c"
> > changed the behavior of INI overriding which is needed only
> > for PCI cards. Revert to the original check.
> >
> > Signed-off-by: Sujith Manoharan <[email protected]>
>
> You leave me no option but to come out of e-mail reply slumber. What
> issues was this causing?
The INI fixup is required only for AR9280 PCI cards. Changing it to a SREV
check that includes all chipsets above AR9280 would mean changing the initvals
for other cards too. The couple of cards I have did not hit this check,
but that doesn't mean that there are no weirdly configured cards out there...
Sujith