From owner-svn-src-head@freebsd.org Thu Mar 8 18:42:24 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 472E4F4B1E3; Thu, 8 Mar 2018 18:42:24 +0000 (UTC) (envelope-from avos@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C09CA69ED4; Thu, 8 Mar 2018 18:42:23 +0000 (UTC) (envelope-from avos@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BB73314AFE; Thu, 8 Mar 2018 18:42:23 +0000 (UTC) (envelope-from avos@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w28IgNVQ001801; Thu, 8 Mar 2018 18:42:23 GMT (envelope-from avos@FreeBSD.org) Received: (from avos@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w28IgNHX001800; Thu, 8 Mar 2018 18:42:23 GMT (envelope-from avos@FreeBSD.org) Message-Id: <201803081842.w28IgNHX001800@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avos set sender to avos@FreeBSD.org using -f From: Andriy Voskoboinyk Date: Thu, 8 Mar 2018 18:42:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r330666 - head/sys/dev/iwi X-SVN-Group: head X-SVN-Commit-Author: avos X-SVN-Commit-Paths: head/sys/dev/iwi X-SVN-Commit-Revision: 330666 X-SVN-Commit-Repository: base 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.25 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: Thu, 08 Mar 2018 18:42:24 -0000 Author: avos Date: Thu Mar 8 18:42:23 2018 New Revision: 330666 URL: https://svnweb.freebsd.org/changeset/base/330666 Log: iwi(4): factor out rateset setup into iwi_set_rateset(). No functional change intended. Modified: head/sys/dev/iwi/if_iwi.c Modified: head/sys/dev/iwi/if_iwi.c ============================================================================== --- head/sys/dev/iwi/if_iwi.c Thu Mar 8 17:23:18 2018 (r330665) +++ head/sys/dev/iwi/if_iwi.c Thu Mar 8 18:42:23 2018 (r330666) @@ -2550,11 +2550,36 @@ iwi_setwepkeys(struct iwi_softc *sc, struct ieee80211v } static int +iwi_set_rateset(struct iwi_softc *sc, const struct ieee80211_rateset *net_rs, + int mode, int type) +{ + struct iwi_rateset rs; + int i; + + memset(&rs, 0, sizeof(rs)); + rs.mode = mode; + rs.type = type; + rs.nrates = net_rs->rs_nrates; + if (rs.nrates > nitems(rs.rates)) { + DPRINTF(("Truncating negotiated rate set from %u\n", + rs.nrates)); + rs.nrates = nitems(rs.rates); + } + memcpy(rs.rates, net_rs->rs_rates, rs.nrates); + DPRINTF(("Setting .11%c%s %s rates (%u)\n", + mode == IWI_MODE_11A ? 'a' : 'b', + mode == IWI_MODE_11G ? "g" : "", + type == IWI_RATESET_TYPE_SUPPORTED ? "supported" : "negotiated", + rs.nrates)); + + return (iwi_cmd(sc, IWI_CMD_SET_RATES, &rs, sizeof(rs))); +} + +static int iwi_config(struct iwi_softc *sc) { struct ieee80211com *ic = &sc->sc_ic; struct iwi_configuration config; - struct iwi_rateset rs; struct iwi_txpower power; uint32_t data; int error, i; @@ -2603,25 +2628,13 @@ iwi_config(struct iwi_softc *sc) return error; } - memset(&rs, 0, sizeof rs); - rs.mode = IWI_MODE_11G; - rs.type = IWI_RATESET_TYPE_SUPPORTED; - rs.nrates = ic->ic_sup_rates[IEEE80211_MODE_11G].rs_nrates; - memcpy(rs.rates, ic->ic_sup_rates[IEEE80211_MODE_11G].rs_rates, - rs.nrates); - DPRINTF(("Setting .11bg supported rates (%u)\n", rs.nrates)); - error = iwi_cmd(sc, IWI_CMD_SET_RATES, &rs, sizeof rs); + error = iwi_set_rateset(sc, &ic->ic_sup_rates[IEEE80211_MODE_11G], + IWI_MODE_11G, IWI_RATESET_TYPE_SUPPORTED); if (error != 0) return error; - memset(&rs, 0, sizeof rs); - rs.mode = IWI_MODE_11A; - rs.type = IWI_RATESET_TYPE_SUPPORTED; - rs.nrates = ic->ic_sup_rates[IEEE80211_MODE_11A].rs_nrates; - memcpy(rs.rates, ic->ic_sup_rates[IEEE80211_MODE_11A].rs_rates, - rs.nrates); - DPRINTF(("Setting .11a supported rates (%u)\n", rs.nrates)); - error = iwi_cmd(sc, IWI_CMD_SET_RATES, &rs, sizeof rs); + error = iwi_set_rateset(sc, &ic->ic_sup_rates[IEEE80211_MODE_11A], + IWI_MODE_11A, IWI_RATESET_TYPE_SUPPORTED); if (error != 0) return error; @@ -2815,7 +2828,6 @@ iwi_auth_and_assoc(struct iwi_softc *sc, struct ieee80 struct ieee80211_node *ni; struct iwi_configuration config; struct iwi_associate *assoc = &sc->assoc; - struct iwi_rateset rs; uint16_t capinfo; uint32_t data; int error, mode; @@ -2885,18 +2897,8 @@ iwi_auth_and_assoc(struct iwi_softc *sc, struct ieee80 goto done; /* the rate set has already been "negotiated" */ - memset(&rs, 0, sizeof rs); - rs.mode = mode; - rs.type = IWI_RATESET_TYPE_NEGOTIATED; - rs.nrates = ni->ni_rates.rs_nrates; - if (rs.nrates > IWI_RATESET_SIZE) { - DPRINTF(("Truncating negotiated rate set from %u\n", - rs.nrates)); - rs.nrates = IWI_RATESET_SIZE; - } - memcpy(rs.rates, ni->ni_rates.rs_rates, rs.nrates); - DPRINTF(("Setting negotiated rates (%u)\n", rs.nrates)); - error = iwi_cmd(sc, IWI_CMD_SET_RATES, &rs, sizeof rs); + error = iwi_set_rateset(sc, &ni->ni_rates, mode, + IWI_RATESET_TYPE_NEGOTIATED); if (error != 0) goto done;