Author: adrian
Date: Wed Nov 9 04:35:33 2011
New Revision: 227372
URL: http://svn.freebsd.org/changeset/base/227372
Log:
Try to make it more obvious when users are using the PCI or PCIe versions of
the 11n chips.
Modified:
head/sys/dev/ath/ath_hal/ah.c
head/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
Modified: head/sys/dev/ath/ath_hal/ah.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ah.c Wed Nov 9 04:08:01 2011
(r227371)
+++ head/sys/dev/ath/ath_hal/ah.c Wed Nov 9 04:35:33 2011
(r227372)
@@ -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 "????";
}
Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c Wed Nov 9 04:08:01
2011 (r227371)
+++ head/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c Wed Nov 9 04:35:33
2011 (r227372)
@@ -916,9 +916,12 @@ ar5416FillCapabilityInfo(struct ath_hal
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);
_______________________________________________
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"
