net80211: add a possibility to retrieve current TX key without encapsulation.

Submitted by:	<s3erios@gmail.com>
Differential Revision:	https://reviews.freebsd.org/D3639

diff --git a/sys/net80211/ieee80211_crypto.c b/sys/net80211/ieee80211_crypto.c
index 5864d2829a9589a48dba704962f42d27854e4221..db54e76da7816f94e5168176a05f1c1bc94f8475 100644 (file)
--- a/sys/net80211/ieee80211_crypto.c
+++ b/sys/net80211/ieee80211_crypto.c
@@ -531,16 +531,11 @@ ieee80211_crypto_get_keyid(struct ieee80211vap *vap, struct ieee80211_key *k)
                return (0);
 }
 
-/*
- * Add privacy headers appropriate for the specified key.
- */
 struct ieee80211_key *
-ieee80211_crypto_encap(struct ieee80211_node *ni, struct mbuf *m)
+ieee80211_crypto_get_txkey(struct ieee80211_node *ni, struct mbuf *m)
 {
        struct ieee80211vap *vap = ni->ni_vap;
-       struct ieee80211_key *k;
        struct ieee80211_frame *wh;
-       const struct ieee80211_cipher *cip;
 
        /*
         * Multicast traffic always uses the multicast key.
@@ -559,12 +554,27 @@ ieee80211_crypto_encap(struct ieee80211_node *ni, struct mbuf *m)
                        vap->iv_stats.is_tx_nodefkey++;
                        return NULL;
                }
-               k = &vap->iv_nw_keys[vap->iv_def_txkey];
-       } else
-               k = &ni->ni_ucastkey;
+               return &vap->iv_nw_keys[vap->iv_def_txkey];
+       }
 
-       cip = k->wk_cipher;
-       return (cip->ic_encap(k, m) ? k : NULL);
+       return &ni->ni_ucastkey;
+}
+
+/*
+ * Add privacy headers appropriate for the specified key.
+ */
+struct ieee80211_key *
+ieee80211_crypto_encap(struct ieee80211_node *ni, struct mbuf *m)
+{
+       struct ieee80211_key *k;
+       const struct ieee80211_cipher *cip;
+
+       if ((k = ieee80211_crypto_get_txkey(ni, m)) != NULL) {
+               cip = k->wk_cipher;
+               return (cip->ic_encap(k, m) ? k : NULL);
+       }
+
+       return NULL;
 }
 
 /*

diff --git a/sys/net80211/ieee80211_crypto.h b/sys/net80211/ieee80211_crypto.h
index 2b6375ea2019676449e00e110686208fe41706f6..cca166d6024b16e63235dd380a9566bf0e0263dd 100644 (file)
--- a/sys/net80211/ieee80211_crypto.h
+++ b/sys/net80211/ieee80211_crypto.h
@@ -195,6 +195,8 @@ int ieee80211_crypto_available(u_int cipher);
 
 uint8_t        ieee80211_crypto_get_keyid(struct ieee80211vap *vap,
                struct ieee80211_key *k);
+struct ieee80211_key *ieee80211_crypto_get_txkey(struct ieee80211_node *,
+               struct mbuf *);
 struct ieee80211_key *ieee80211_crypto_encap(struct ieee80211_node *,
                struct mbuf *);
 struct ieee80211_key *ieee80211_crypto_decap(struct ieee80211_node *,