Author: bschmidt
Date: Sat Jun 18 12:13:27 2011
New Revision: 223253
URL: http://svn.freebsd.org/changeset/base/223253
Log:
MFC r220894:
The 6000 series gen2 adapters have 2 firmware images, one with
advanced btcoex support and one without.
Modified:
stable/8/sys/dev/iwn/if_iwn.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/sys/dev/iwn/if_iwn.c
==============================================================================
--- stable/8/sys/dev/iwn/if_iwn.c Sat Jun 18 12:11:48 2011
(r223252)
+++ stable/8/sys/dev/iwn/if_iwn.c Sat Jun 18 12:13:27 2011
(r223253)
@@ -816,9 +816,11 @@ iwn5000_attach(struct iwn_softc *sc, uin
break;
case IWN_HW_REV_TYPE_6005:
sc->limits = &iwn6000_sensitivity_limits;
- sc->fwname = "iwn6005fw";
- if (pid != 0x0082 && pid != 0x0085)
+ if (pid != 0x0082 && pid != 0x0085) {
+ sc->fwname = "iwn6000g2bfw";
sc->sc_flags |= IWN_FLAG_ADV_BTCOEX;
+ } else
+ sc->fwname = "iwn6000g2afw";
break;
default:
device_printf(sc->sc_dev, "adapter type %d not supported\n",
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
