From owner-svn-src-head@freebsd.org Wed Dec 7 22:16:09 2016 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 05C4FC6CEE4; Wed, 7 Dec 2016 22:16:09 +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 mx1.freebsd.org (Postfix) with ESMTPS id D494E10E9; Wed, 7 Dec 2016 22:16:08 +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 uB7MG8va096679; Wed, 7 Dec 2016 22:16:08 GMT (envelope-from avos@FreeBSD.org) Received: (from avos@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB7MG7vT096673; Wed, 7 Dec 2016 22:16:07 GMT (envelope-from avos@FreeBSD.org) Message-Id: <201612072216.uB7MG7vT096673@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avos set sender to avos@FreeBSD.org using -f From: Andriy Voskoboinyk Date: Wed, 7 Dec 2016 22:16:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r309686 - in head/sys: dev/ath dev/mwl dev/rtwn dev/usb/wlan net80211 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: Wed, 07 Dec 2016 22:16:09 -0000 Author: avos Date: Wed Dec 7 22:16:07 2016 New Revision: 309686 URL: https://svnweb.freebsd.org/changeset/base/309686 Log: net80211 + drivers: convert to ieee80211_crypto_get_key_wepidx(). Proposed by: adrian Modified: head/sys/dev/ath/if_ath_keycache.c head/sys/dev/mwl/if_mwl.c head/sys/dev/rtwn/if_rtwn_cam.c head/sys/dev/usb/wlan/if_rsu.c head/sys/dev/usb/wlan/if_rum.c head/sys/net80211/ieee80211_crypto.c Modified: head/sys/dev/ath/if_ath_keycache.c ============================================================================== --- head/sys/dev/ath/if_ath_keycache.c Wed Dec 7 22:01:09 2016 (r309685) +++ head/sys/dev/ath/if_ath_keycache.c Wed Dec 7 22:16:07 2016 (r309686) @@ -449,7 +449,8 @@ ath_key_alloc(struct ieee80211vap *vap, * have no way to check if they've already * been allocated. */ - *keyix = *rxkeyix = k - vap->iv_nw_keys; + *keyix = *rxkeyix = + ieee80211_crypto_get_key_wepidx(vap, k); return 1; } /* Modified: head/sys/dev/mwl/if_mwl.c ============================================================================== --- head/sys/dev/mwl/if_mwl.c Wed Dec 7 22:01:09 2016 (r309685) +++ head/sys/dev/mwl/if_mwl.c Wed Dec 7 22:16:07 2016 (r309686) @@ -1529,7 +1529,7 @@ mwl_key_alloc(struct ieee80211vap *vap, return 0; } /* give the caller what they requested */ - *keyix = *rxkeyix = k - vap->iv_nw_keys; + *keyix = *rxkeyix = ieee80211_crypto_get_key_wepidx(vap, k); } else { /* * Firmware handles key allocation. Modified: head/sys/dev/rtwn/if_rtwn_cam.c ============================================================================== --- head/sys/dev/rtwn/if_rtwn_cam.c Wed Dec 7 22:01:09 2016 (r309685) +++ head/sys/dev/rtwn/if_rtwn_cam.c Wed Dec 7 22:16:07 2016 (r309686) @@ -118,7 +118,11 @@ rtwn_key_alloc(struct ieee80211vap *vap, if (&vap->iv_nw_keys[0] <= k && k < &vap->iv_nw_keys[IEEE80211_WEP_NKID]) { +#if __FreeBSD_version > 1200018 + *keyix = ieee80211_crypto_get_key_wepidx(vap, k); +#else *keyix = k - vap->iv_nw_keys; +#endif if (sc->sc_hwcrypto != RTWN_CRYPTO_FULL) k->wk_flags |= IEEE80211_KEY_SWCRYPT; else { Modified: head/sys/dev/usb/wlan/if_rsu.c ============================================================================== --- head/sys/dev/usb/wlan/if_rsu.c Wed Dec 7 22:01:09 2016 (r309685) +++ head/sys/dev/usb/wlan/if_rsu.c Wed Dec 7 22:16:07 2016 (r309686) @@ -1428,7 +1428,7 @@ rsu_key_alloc(struct ieee80211vap *vap, if (&vap->iv_nw_keys[0] <= k && k < &vap->iv_nw_keys[IEEE80211_WEP_NKID]) { - *keyix = k - vap->iv_nw_keys; + *keyix = ieee80211_crypto_get_key_wepidx(vap, k); } else { if (vap->iv_opmode != IEEE80211_M_STA) { *keyix = 0; Modified: head/sys/dev/usb/wlan/if_rum.c ============================================================================== --- head/sys/dev/usb/wlan/if_rum.c Wed Dec 7 22:01:09 2016 (r309685) +++ head/sys/dev/usb/wlan/if_rum.c Wed Dec 7 22:16:07 2016 (r309686) @@ -3046,7 +3046,7 @@ rum_key_alloc(struct ieee80211vap *vap, } else *keyix = 0; } else { - *keyix = k - vap->iv_nw_keys; + *keyix = ieee80211_crypto_get_key_wepidx(vap, k); } *rxkeyix = *keyix; return 1; Modified: head/sys/net80211/ieee80211_crypto.c ============================================================================== --- head/sys/net80211/ieee80211_crypto.c Wed Dec 7 22:01:09 2016 (r309685) +++ head/sys/net80211/ieee80211_crypto.c Wed Dec 7 22:16:07 2016 (r309686) @@ -78,7 +78,7 @@ null_key_alloc(struct ieee80211vap *vap, return 0; *keyix = 0; /* NB: use key index 0 for ucast key */ } else { - *keyix = k - vap->iv_nw_keys; + *keyix = ieee80211_crypto_get_key_wepidx(vap, k); } *rxkeyix = IEEE80211_KEYIX_NONE; /* XXX maybe *keyix? */ return 1;