From b4c249fee120c341168dea58a0be11de097097b6 Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Wed, 23 Dec 2009 19:54:52 +1100 Subject: [PATCH] --- yaml --- r: 186603 b: refs/heads/master c: 9bfafe825d0af5f4cbb2aaaecad0cf9a459cf6b1 h: refs/heads/master i: 186601: ad89cb20ea512e0423029ac4acc72fdb2dbfb830 186599: c2535142a8b34a1c80bbfa66352058204fc01bea v: v3 --- [refs] | 2 +- .../rtl8192e/ieee80211/ieee80211_crypt_ccmp.c | 19 +++++++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index e46a4dcd64c7..6a3d72dbc1e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db15438cd5be7380cdf27c8adb8fc71a72da0210 +refs/heads/master: 9bfafe825d0af5f4cbb2aaaecad0cf9a459cf6b1 diff --git a/trunk/drivers/staging/rtl8192e/ieee80211/ieee80211_crypt_ccmp.c b/trunk/drivers/staging/rtl8192e/ieee80211/ieee80211_crypt_ccmp.c index 70159cf28bce..d5fe94d74b52 100644 --- a/trunk/drivers/staging/rtl8192e/ieee80211/ieee80211_crypt_ccmp.c +++ b/trunk/drivers/staging/rtl8192e/ieee80211/ieee80211_crypt_ccmp.c @@ -475,12 +475,19 @@ static int ieee80211_ccmp_get_key(void *key, int len, u8 *seq, void *priv) static char * ieee80211_ccmp_print_stats(char *p, void *priv) { struct ieee80211_ccmp_data *ccmp = priv; - p += sprintf(p, "key[%d] alg=CCMP key_set=%d " - "tx_pn=%02x%02x%02x%02x%02x%02x " - "rx_pn=%02x%02x%02x%02x%02x%02x " - "format_errors=%d replays=%d decrypt_errors=%d\n", - ccmp->key_idx, ccmp->key_set, - ccmp->tx_pn, ccmp->rx_pn, + int i; + + p += sprintf(p, "key[%d] alg=CCMP key_set=%d tx_pn=", + ccmp->key_idx, ccmp->key_set); + + for (i = 0; i < ARRAY_SIZE(ccmp->tx_pn); i++) + p += sprintf(p, "%02x", ccmp->tx_pn[i]); + + sprintf(p, " rx_pn="); + for (i = 0; i < ARRAY_SIZE(ccmp->rx_pn); i++) + p += sprintf(p, "%02x", ccmp->tx_pn[i]); + + p += sprintf(p, " format_errors=%d replays=%d decrypt_errors=%d\n", ccmp->dot11RSNAStatsCCMPFormatErrors, ccmp->dot11RSNAStatsCCMPReplays, ccmp->dot11RSNAStatsCCMPDecryptErrors);