diff options
| author | Sam Leffler <sam@FreeBSD.org> | 2004-12-31 20:58:06 +0000 |
|---|---|---|
| committer | Sam Leffler <sam@FreeBSD.org> | 2004-12-31 20:58:06 +0000 |
| commit | f287c95b863939253ba01a92974655032d89f488 (patch) | |
| tree | b6d1a8f99001b9de2583f6ec6ddc927eed5e3456 /sys/net80211 | |
| parent | dfefa312d913ce7d4eab7fc756201cd5e5bf7da2 (diff) | |
| download | src-f287c95b863939253ba01a92974655032d89f488.tar.gz src-f287c95b863939253ba01a92974655032d89f488.zip | |
whitespace/debug msg fixups
Notes
Notes:
svn path=/head/; revision=139510
Diffstat (limited to 'sys/net80211')
| -rw-r--r-- | sys/net80211/ieee80211_crypto_none.c | 4 | ||||
| -rw-r--r-- | sys/net80211/ieee80211_crypto_tkip.c | 11 |
2 files changed, 7 insertions, 8 deletions
diff --git a/sys/net80211/ieee80211_crypto_none.c b/sys/net80211/ieee80211_crypto_none.c index 6d53ea942f92..5179768f01fb 100644 --- a/sys/net80211/ieee80211_crypto_none.c +++ b/sys/net80211/ieee80211_crypto_none.c @@ -103,7 +103,7 @@ none_encap(struct ieee80211_key *k, struct mbuf *m, u_int8_t keyid) * happen, at least, when changing keys. */ IEEE80211_DPRINTF(ic, IEEE80211_MSG_CRYPTO, - "[%s] key (id %u) is invalid\n", + "[%s] key id %u is not set (encap)\n", ether_sprintf(wh->i_addr1), keyid>>6); ic->ic_stats.is_tx_badcipher++; return 0; @@ -124,7 +124,7 @@ none_decap(struct ieee80211_key *k, struct mbuf *m) */ /* XXX useful to know dst too */ IEEE80211_DPRINTF(ic, IEEE80211_MSG_CRYPTO, - "[%s] key (id %u) is invalid\n", + "[%s] key id %u is not set (decap)\n", ether_sprintf(wh->i_addr2), ivp[IEEE80211_WEP_IVLEN] >> 6); ic->ic_stats.is_rx_badkeyid++; return 0; diff --git a/sys/net80211/ieee80211_crypto_tkip.c b/sys/net80211/ieee80211_crypto_tkip.c index 41f68512f767..fd029180d23f 100644 --- a/sys/net80211/ieee80211_crypto_tkip.c +++ b/sys/net80211/ieee80211_crypto_tkip.c @@ -200,7 +200,7 @@ tkip_encap(struct ieee80211_key *k, struct mbuf *m, u_int8_t keyid) return 0; /* NB: tkip_encrypt handles wk_keytsc */ } else - k->wk_keytsc++; /* XXX wrap at 48 bits */ + k->wk_keytsc++; return 1; } @@ -264,7 +264,7 @@ tkip_decap(struct ieee80211_key *k, struct mbuf *m) * No extended IV; discard frame. */ IEEE80211_DPRINTF(ctx->tc_ic, IEEE80211_MSG_CRYPTO, - "[%s] Missing ExtIV for TKIP cipher\n", + "[%s] missing ExtIV for TKIP cipher\n", ether_sprintf(wh->i_addr2)); ctx->tc_ic->ic_stats.is_rx_tkipformat++; return 0; @@ -274,14 +274,13 @@ tkip_decap(struct ieee80211_key *k, struct mbuf *m) */ if (ic->ic_flags & IEEE80211_F_COUNTERM) { IEEE80211_DPRINTF(ic, IEEE80211_MSG_CRYPTO, - "[%s] Discard frame due to countermeasures (%s)\n", + "[%s] discard frame due to countermeasures (%s)\n", ether_sprintf(wh->i_addr2), __func__); ic->ic_stats.is_crypto_tkipcm++; return 0; } - ctx->rx_rsc = READ_6(ivp[2], ivp[0], ivp[4], ivp[5], - ivp[6], ivp[7]); + ctx->rx_rsc = READ_6(ivp[2], ivp[0], ivp[4], ivp[5], ivp[6], ivp[7]); if (ctx->rx_rsc <= k->wk_keyrsc) { /* * Replay violation; notify upper layer. @@ -917,7 +916,7 @@ tkip_encrypt(struct tkip_ctx *ctx, struct ieee80211_key *key, icv); (void) m_append(m, IEEE80211_WEP_CRCLEN, icv); /* XXX check return */ - key->wk_keytsc++; /* XXX wrap at 48 bits */ + key->wk_keytsc++; if ((u16)(key->wk_keytsc) == 0) ctx->tx_phase1_done = 0; return 1; |