Try to make it more obvious when users are using the PCI or PCIe versions of

the 11n chips.
This commit is contained in:
Adrian Chadd 2011-11-09 04:35:33 +00:00
parent ec3dec2ff3
commit 5b77f8e9f5
2 changed files with 12 additions and 5 deletions

View File

@ -114,11 +114,15 @@ ath_hal_mac_name(struct ath_hal *ah)
case AR_XSREV_VERSION_SOWL:
return "9160";
case AR_XSREV_VERSION_MERLIN:
return "9280";
if (AH_PRIVATE(ah)->ah_ispcie)
return "9280";
return "9220";
case AR_XSREV_VERSION_KITE:
return "9285";
case AR_XSREV_VERSION_KIWI:
return "9287";
if (AH_PRIVATE(ah)->ah_ispcie)
return "9287";
return "9227";
}
return "????";
}

View File

@ -916,9 +916,12 @@ ar5416FillCapabilityInfo(struct ath_hal *ah)
static const char*
ar5416Probe(uint16_t vendorid, uint16_t devid)
{
if (vendorid == ATHEROS_VENDOR_ID &&
(devid == AR5416_DEVID_PCI || devid == AR5416_DEVID_PCIE))
return "Atheros 5416";
if (vendorid == ATHEROS_VENDOR_ID) {
if (devid == AR5416_DEVID_PCI)
return "Atheros 5416";
if (devid == AR5416_DEVID_PCIE)
return "Atheros 5418";
}
return AH_NULL;
}
AH_CHIP(AR5416, ar5416Probe, ar5416Attach);