From da166fc6469b98397de98a7ccc13b82a3cd3b290 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Fri, 29 Jun 2018 21:49:46 -0400 Subject: [PATCH] iprowifi4965: Add the missing IWN_SDID_6035_5 subdevice. This goes with the "IWN_DID_6035_2" (0x088F) device ID. We had added the device ID in the FreeBSD 9 version of the driver, which didn't properly handle the device but somehow still managed to use it. Thanks to miqlas for reporting and then confirming this fix. --- .../kernel/drivers/network/wlan/iprowifi4965/dev/iwn/if_iwn.c | 1 + .../drivers/network/wlan/iprowifi4965/dev/iwn/if_iwn_devid.h | 1 + 2 files changed, 2 insertions(+) diff --git a/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn/if_iwn.c b/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn/if_iwn.c index 219e39d09f..69be8a2244 100644 --- a/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn/if_iwn.c +++ b/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn/if_iwn.c @@ -863,6 +863,7 @@ iwn_config_specific(struct iwn_softc *sc, uint16_t pid) case IWN_SDID_6035_2: case IWN_SDID_6035_3: case IWN_SDID_6035_4: + case IWN_SDID_6035_5: sc->fwname = "iwn6000g2bfw"; sc->limits = &iwn6235_sensitivity_limits; sc->base_params = &iwn_6235_base_params; diff --git a/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn/if_iwn_devid.h b/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn/if_iwn_devid.h index dd08737d94..8470038185 100644 --- a/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn/if_iwn_devid.h +++ b/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn/if_iwn_devid.h @@ -170,6 +170,7 @@ #define IWN_SDID_6035_2 0x4260 #define IWN_SDID_6035_3 0x4460 #define IWN_SDID_6035_4 0x4860 +#define IWN_SDID_6035_5 0x5260 /* * -------------------------------------------------------------------------- * Device ID for 1030 and 6030 Series