Date: Fri, 17 Aug 2018 03:01:02 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r337949 - stable/11/sys/dev/iwn Message-ID: <201808170301.w7H312aQ009758@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevans Date: Fri Aug 17 03:01:01 2018 New Revision: 337949 URL: https://svnweb.freebsd.org/changeset/base/337949 Log: MFC r335785, r335812 r335785 by eadler: iwn: Correct Centrino Advanced-N 6235 constants The iwn 6235 is a 2x2 device (see https://ark.intel.com/products/66890/Intel-Centrino-Advanced-N-6235-Dual-Band) r335812 by eadler: iwn: Add the missing IWN_SDID_6035_5 subdevice Modified: stable/11/sys/dev/iwn/if_iwn.c stable/11/sys/dev/iwn/if_iwn_chip_cfg.h stable/11/sys/dev/iwn/if_iwn_devid.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/iwn/if_iwn.c ============================================================================== --- stable/11/sys/dev/iwn/if_iwn.c Fri Aug 17 02:46:36 2018 (r337948) +++ stable/11/sys/dev/iwn/if_iwn.c Fri Aug 17 03:01:01 2018 (r337949) @@ -860,6 +860,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; Modified: stable/11/sys/dev/iwn/if_iwn_chip_cfg.h ============================================================================== --- stable/11/sys/dev/iwn/if_iwn_chip_cfg.h Fri Aug 17 02:46:36 2018 (r337948) +++ stable/11/sys/dev/iwn/if_iwn_chip_cfg.h Fri Aug 17 03:01:01 2018 (r337949) @@ -382,8 +382,7 @@ static const struct iwn_base_params iwn_6235_base_para | IWN_FLG_NEED_PHY_CALIB_TEMP_OFFSET ), .support_hostap = false, .no_multi_vaps = true, - /* XXX 1x2? This NIC is 2x2, right? */ - .additional_gp_drv_bit = IWN_GP_DRIVER_6050_1X2, + .additional_gp_drv_bit = 0, .bt_mode = IWN_BT_ADVANCED, .plcp_err_threshold = IWN_PLCP_ERR_DEFAULT_THRESHOLD, }; Modified: stable/11/sys/dev/iwn/if_iwn_devid.h ============================================================================== --- stable/11/sys/dev/iwn/if_iwn_devid.h Fri Aug 17 02:46:36 2018 (r337948) +++ stable/11/sys/dev/iwn/if_iwn_devid.h Fri Aug 17 03:01:01 2018 (r337949) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808170301.w7H312aQ009758>