Date: Wed, 20 Apr 2011 17:43:21 +0000 (UTC) From: Bernhard Schmidt <bschmidt@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r220894 - head/sys/dev/iwn Message-ID: <201104201743.p3KHhLUO059385@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bschmidt Date: Wed Apr 20 17:43:20 2011 New Revision: 220894 URL: http://svn.freebsd.org/changeset/base/220894 Log: The 6000 series gen2 adapters have 2 firmware images, one with advanced btcoex support and one without. Modified: head/sys/dev/iwn/if_iwn.c Modified: head/sys/dev/iwn/if_iwn.c ============================================================================== --- head/sys/dev/iwn/if_iwn.c Wed Apr 20 17:34:09 2011 (r220893) +++ head/sys/dev/iwn/if_iwn.c Wed Apr 20 17:43:20 2011 (r220894) @@ -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",
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201104201743.p3KHhLUO059385>