From owner-svn-src-head@freebsd.org Sat Mar 25 02:44:26 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C0D5CD1C3CB; Sat, 25 Mar 2017 02:44:26 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 756F8128A; Sat, 25 Mar 2017 02:44:26 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2P2iPxw038305; Sat, 25 Mar 2017 02:44:25 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2P2iPfe038304; Sat, 25 Mar 2017 02:44:25 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201703250244.v2P2iPfe038304@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Sat, 25 Mar 2017 02:44:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r315924 - head/sys/dev/iwm X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Mar 2017 02:44:26 -0000 Author: adrian Date: Sat Mar 25 02:44:25 2017 New Revision: 315924 URL: https://svnweb.freebsd.org/changeset/base/315924 Log: [iwm] GC unused code from if_iwm_scan.c, copyied from iwn or iwlwifi/dvm. Obtained from: dragonflybsd.git 10881df269b93c26e5ee6af629c36db5672e6e52 Modified: head/sys/dev/iwm/if_iwm_scan.c Modified: head/sys/dev/iwm/if_iwm_scan.c ============================================================================== --- head/sys/dev/iwm/if_iwm_scan.c Sat Mar 25 02:42:52 2017 (r315923) +++ head/sys/dev/iwm/if_iwm_scan.c Sat Mar 25 02:44:25 2017 (r315924) @@ -161,12 +161,6 @@ __FBSDID("$FreeBSD$"); * BEGIN mvm/scan.c */ -#define IWM_PLCP_QUIET_THRESH 1 -#define IWM_ACTIVE_QUIET_TIME 10 -#define LONG_OUT_TIME_PERIOD (600 * IEEE80211_DUR_TU) -#define SHORT_OUT_TIME_PERIOD (200 * IEEE80211_DUR_TU) -#define SUSPEND_TIME_PERIOD (100 * IEEE80211_DUR_TU) - static uint16_t iwm_mvm_scan_rx_chain(struct iwm_softc *sc) { @@ -181,26 +175,6 @@ iwm_mvm_scan_rx_chain(struct iwm_softc * return htole16(rx_chain); } -#if 0 -static uint32_t -iwm_mvm_scan_max_out_time(struct iwm_softc *sc, uint32_t flags, int is_assoc) -{ - if (!is_assoc) - return 0; - if (flags & 0x1) - return htole32(SHORT_OUT_TIME_PERIOD); - return htole32(LONG_OUT_TIME_PERIOD); -} - -static uint32_t -iwm_mvm_scan_suspend_time(struct iwm_softc *sc, int is_assoc) -{ - if (!is_assoc) - return 0; - return htole32(SUSPEND_TIME_PERIOD); -} -#endif - static uint32_t iwm_mvm_scan_rate_n_flags(struct iwm_softc *sc, int flags, int no_cck) { @@ -224,32 +198,6 @@ iwm_mvm_scan_rate_n_flags(struct iwm_sof return htole32(IWM_RATE_6M_PLCP | tx_ant); } -#if 0 -/* - * If req->n_ssids > 0, it means we should do an active scan. - * In case of active scan w/o directed scan, we receive a zero-length SSID - * just to notify that this scan is active and not passive. - * In order to notify the FW of the number of SSIDs we wish to scan (including - * the zero-length one), we need to set the corresponding bits in chan->type, - * one for each SSID, and set the active bit (first). If the first SSID is - * already included in the probe template, so we need to set only - * req->n_ssids - 1 bits in addition to the first bit. - */ -static uint16_t -iwm_mvm_get_active_dwell(struct iwm_softc *sc, int flags, int n_ssids) -{ - if (flags & IEEE80211_CHAN_2GHZ) - return 30 + 3 * (n_ssids + 1); - return 20 + 2 * (n_ssids + 1); -} - -static uint16_t -iwm_mvm_get_passive_dwell(struct iwm_softc *sc, int flags) -{ - return (flags & IEEE80211_CHAN_2GHZ) ? 100 + 20 : 100 + 10; -} -#endif - static int iwm_mvm_scan_skip_channel(struct ieee80211_channel *c) {