PERFORCE change 139239 for review
Sam Leffler
sam at FreeBSD.org
Wed Apr 2 13:47:03 PDT 2008
http://perforce.freebsd.org/chv.cgi?CH=139239
Change 139239 by sam at sam_ebb on 2008/04/02 20:46:28
remove iv_cryptocaps; crypto capabilities are a property of
the driver/device so they should never be different from one
vap to another
Affected files ...
.. //depot/projects/vap/sys/net80211/ieee80211.c#34 edit
.. //depot/projects/vap/sys/net80211/ieee80211_crypto.c#13 edit
.. //depot/projects/vap/sys/net80211/ieee80211_ddb.c#11 edit
.. //depot/projects/vap/sys/net80211/ieee80211_var.h#37 edit
Differences ...
==== //depot/projects/vap/sys/net80211/ieee80211.c#34 (text+ko) ====
@@ -324,7 +324,6 @@
vap->iv_flags_ext = ic->ic_flags_ext;
vap->iv_flags_ven = ic->ic_flags_ven;
vap->iv_caps = ic->ic_caps &~ IEEE80211_C_OPMODE;
- vap->iv_cryptocaps = ic->ic_cryptocaps;
vap->iv_htcaps = ic->ic_htcaps;
vap->iv_opmode = opmode;
switch (opmode) {
==== //depot/projects/vap/sys/net80211/ieee80211_crypto.c#13 (text+ko) ====
@@ -262,6 +262,7 @@
ieee80211_crypto_newkey(struct ieee80211vap *vap,
int cipher, int flags, struct ieee80211_key *key)
{
+ struct ieee80211com *ic = vap->iv_ic;
const struct ieee80211_cipher *cip;
ieee80211_keyix keyix, rxkeyix;
void *keyctx;
@@ -309,7 +310,7 @@
* If the hardware does not support the cipher then
* fallback to a host-based implementation.
*/
- if ((vap->iv_cryptocaps & (1<<cipher)) == 0) {
+ if ((ic->ic_cryptocaps & (1<<cipher)) == 0) {
IEEE80211_DPRINTF(vap, IEEE80211_MSG_CRYPTO,
"%s: no h/w support for cipher %s, falling back to s/w\n",
__func__, cip->ic_name);
@@ -321,7 +322,7 @@
* the cipher modules honor it.
*/
if (cipher == IEEE80211_CIPHER_TKIP &&
- (vap->iv_cryptocaps & IEEE80211_CRYPTO_TKIPMIC) == 0) {
+ (ic->ic_cryptocaps & IEEE80211_CRYPTO_TKIPMIC) == 0) {
IEEE80211_DPRINTF(vap, IEEE80211_MSG_CRYPTO,
"%s: no h/w support for TKIP MIC, falling back to s/w\n",
__func__);
==== //depot/projects/vap/sys/net80211/ieee80211_ddb.c#11 (text+ko) ====
@@ -330,8 +330,6 @@
db_printf("\tflags_ext=%b\n", vap->iv_flags_ext, IEEE80211_FEXT_BITS);
db_printf("\tflags_ven=%b\n", vap->iv_flags_ven, IEEE80211_FVEN_BITS);
db_printf("\tcaps=%b\n", vap->iv_caps, IEEE80211_C_BITS);
- db_printf("\tcryptocaps=%b\n",
- vap->iv_cryptocaps, IEEE80211_C_CRYPTO_BITS);
db_printf("\thtcaps=%b\n", vap->iv_htcaps, IEEE80211_C_HTCAP_BITS);
_db_show_stats(&vap->iv_stats);
==== //depot/projects/vap/sys/net80211/ieee80211_var.h#37 (text+ko) ====
@@ -293,7 +293,6 @@
uint32_t iv_flags_ven; /* vendor state flags */
uint32_t iv_caps; /* capabilities */
uint32_t iv_htcaps; /* HT capabilities */
- uint32_t iv_cryptocaps; /* crypto capabilities */
enum ieee80211_opmode iv_opmode; /* operation mode */
enum ieee80211_state iv_state; /* state machine state */
void (*iv_newstate_cb)(struct ieee80211vap *,
More information about the p4-projects
mailing list