From 57becf59eae32c3a5fd61dfce3a013ed18dc4eb4 Mon Sep 17 00:00:00 2001 From: Bernhard Schmidt Date: Wed, 20 Apr 2011 17:43:20 +0000 Subject: [PATCH] The 6000 series gen2 adapters have 2 firmware images, one with advanced btcoex support and one without. --- sys/dev/iwn/if_iwn.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/dev/iwn/if_iwn.c b/sys/dev/iwn/if_iwn.c index 3a6c6ba4758..bed1d4ed781 100644 --- a/sys/dev/iwn/if_iwn.c +++ b/sys/dev/iwn/if_iwn.c @@ -816,9 +816,11 @@ iwn5000_attach(struct iwn_softc *sc, uint16_t pid) 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",