Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 7 Dec 2016 22:16:07 +0000 (UTC)
From:      Andriy Voskoboinyk <avos@FreeBSD.org>
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
Message-ID:  <201612072216.uB7MG7vT096673@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
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;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612072216.uB7MG7vT096673>