Replace printk having a log level with the appropriate
net_*macro_ratelimited.
It's better to use actual device name as a prefix in error messages.
Indentation is also changed, to fix the checkpatch issue if line is not
exceding 80 characters.
Signed-off-by: Arushi Singhal <[email protected]>
---
changes in v2
*change the subject line, in v1 driver name was wrong.
.../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c
index e6648f7..200fe5f 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c
@@ -73,7 +73,7 @@ static void *ieee80211_ccmp_init(int key_idx)
priv->tfm = (void *)crypto_alloc_cipher("aes", 0, CRYPTO_ALG_ASYNC);
if (IS_ERR(priv->tfm)) {
- printk(KERN_DEBUG "ieee80211_crypt_ccmp: could not allocate crypto API aes\n");
+ net_dbg_ratelimited("ieee80211_crypt_ccmp: could not allocate crypto API aes\n");
priv->tfm = NULL;
goto fail;
}
@@ -276,22 +276,22 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
keyidx = pos[3];
if (!(keyidx & (1 << 5))) {
if (net_ratelimit()) {
- printk(KERN_DEBUG "CCMP: received packet without ExtIV flag from %pM\n",
- hdr->addr2);
+ net_dbg_ratelimited("CCMP: received packet without ExtIV flag from %pM\n",
+ hdr->addr2);
}
key->dot11RSNAStatsCCMPFormatErrors++;
return -2;
}
keyidx >>= 6;
if (key->key_idx != keyidx) {
- printk(KERN_DEBUG "CCMP: RX tkey->key_idx=%d frame keyidx=%d priv=%p\n",
- key->key_idx, keyidx, priv);
+ net_dbg_ratelimited("CCMP: RX tkey->key_idx=%d frame keyidx=%d priv=%p\n",
+ key->key_idx, keyidx, priv);
return -6;
}
if (!key->key_set) {
if (net_ratelimit()) {
- printk(KERN_DEBUG "CCMP: received packet from %pM with keyid=%d that does not have a configured key\n",
- hdr->addr2, keyidx);
+ net_dbg_ratelimited("CCMP: received packet from %pM with keyid=%d that does not have a configured key\n",
+ hdr->addr2, keyidx);
}
return -3;
}
@@ -306,8 +306,8 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
if (memcmp(pn, key->rx_pn, CCMP_PN_LEN) <= 0) {
if (net_ratelimit()) {
- printk(KERN_DEBUG "CCMP: replay detected: STA=%pM previous PN %pm received PN %pm\n",
- hdr->addr2, key->rx_pn, pn);
+ net_dbg_ratelimited("CCMP: replay detected: STA=%pM previous PN %pm received PN %pm\n",
+ hdr->addr2, key->rx_pn, pn);
}
key->dot11RSNAStatsCCMPReplays++;
return -4;
@@ -341,8 +341,8 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
if (memcmp(mic, a, CCMP_MIC_LEN) != 0) {
if (net_ratelimit()) {
- printk(KERN_DEBUG "CCMP: decrypt failed: STA=%pM\n",
- hdr->addr2);
+ net_dbg_ratelimited("CCMP: decrypt failed: STA=%pM\n",
+ hdr->addr2);
}
key->dot11RSNAStatsCCMPDecryptErrors++;
return -5;
--
2.7.4
On Mon, 5 Mar 2018, Arushi Singhal wrote:
> Replace printk having a log level with the appropriate
> net_*macro_ratelimited.
> It's better to use actual device name as a prefix in error messages.
I asked several questions about the above two lines, which as far as I can
see haven't been answered. Please excuse me if I missed the answers, but I
would still like to know what they are.
Namely, why did you choose to change to rate limited output, and what does
the "device name as a prefix" comment mean?
julia
> Indentation is also changed, to fix the checkpatch issue if line is not
> exceding 80 characters.
>
> Signed-off-by: Arushi Singhal <[email protected]>
> ---
> changes in v2
> *change the subject line, in v1 driver name was wrong.
>
> .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 22 +++++++++++-----------
> 1 file changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c
> index e6648f7..200fe5f 100644
> --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c
> +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c
> @@ -73,7 +73,7 @@ static void *ieee80211_ccmp_init(int key_idx)
>
> priv->tfm = (void *)crypto_alloc_cipher("aes", 0, CRYPTO_ALG_ASYNC);
> if (IS_ERR(priv->tfm)) {
> - printk(KERN_DEBUG "ieee80211_crypt_ccmp: could not allocate crypto API aes\n");
> + net_dbg_ratelimited("ieee80211_crypt_ccmp: could not allocate crypto API aes\n");
> priv->tfm = NULL;
> goto fail;
> }
> @@ -276,22 +276,22 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
> keyidx = pos[3];
> if (!(keyidx & (1 << 5))) {
> if (net_ratelimit()) {
> - printk(KERN_DEBUG "CCMP: received packet without ExtIV flag from %pM\n",
> - hdr->addr2);
> + net_dbg_ratelimited("CCMP: received packet without ExtIV flag from %pM\n",
> + hdr->addr2);
> }
> key->dot11RSNAStatsCCMPFormatErrors++;
> return -2;
> }
> keyidx >>= 6;
> if (key->key_idx != keyidx) {
> - printk(KERN_DEBUG "CCMP: RX tkey->key_idx=%d frame keyidx=%d priv=%p\n",
> - key->key_idx, keyidx, priv);
> + net_dbg_ratelimited("CCMP: RX tkey->key_idx=%d frame keyidx=%d priv=%p\n",
> + key->key_idx, keyidx, priv);
> return -6;
> }
> if (!key->key_set) {
> if (net_ratelimit()) {
> - printk(KERN_DEBUG "CCMP: received packet from %pM with keyid=%d that does not have a configured key\n",
> - hdr->addr2, keyidx);
> + net_dbg_ratelimited("CCMP: received packet from %pM with keyid=%d that does not have a configured key\n",
> + hdr->addr2, keyidx);
> }
> return -3;
> }
> @@ -306,8 +306,8 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
>
> if (memcmp(pn, key->rx_pn, CCMP_PN_LEN) <= 0) {
> if (net_ratelimit()) {
> - printk(KERN_DEBUG "CCMP: replay detected: STA=%pM previous PN %pm received PN %pm\n",
> - hdr->addr2, key->rx_pn, pn);
> + net_dbg_ratelimited("CCMP: replay detected: STA=%pM previous PN %pm received PN %pm\n",
> + hdr->addr2, key->rx_pn, pn);
> }
> key->dot11RSNAStatsCCMPReplays++;
> return -4;
> @@ -341,8 +341,8 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
>
> if (memcmp(mic, a, CCMP_MIC_LEN) != 0) {
> if (net_ratelimit()) {
> - printk(KERN_DEBUG "CCMP: decrypt failed: STA=%pM\n",
> - hdr->addr2);
> + net_dbg_ratelimited("CCMP: decrypt failed: STA=%pM\n",
> + hdr->addr2);
> }
> key->dot11RSNAStatsCCMPDecryptErrors++;
> return -5;
> --
> 2.7.4
>
> --
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
> To post to this group, send email to [email protected].
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20180305073256.GA4347%40seema-Inspiron-15-3567.
> For more options, visit https://groups.google.com/d/optout.
>
On Mon, Mar 05, 2018 at 01:02:56PM +0530, Arushi Singhal wrote:
> Replace printk having a log level with the appropriate
> net_*macro_ratelimited.
> It's better to use actual device name as a prefix in error messages.
> Indentation is also changed, to fix the checkpatch issue if line is not
> exceding 80 characters.
>
> Signed-off-by: Arushi Singhal <[email protected]>
> ---
> changes in v2
> *change the subject line, in v1 driver name was wrong.
>
> .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 22 +++++++++++-----------
> 1 file changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c
> index e6648f7..200fe5f 100644
> --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c
> +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c
> @@ -73,7 +73,7 @@ static void *ieee80211_ccmp_init(int key_idx)
>
> priv->tfm = (void *)crypto_alloc_cipher("aes", 0, CRYPTO_ALG_ASYNC);
> if (IS_ERR(priv->tfm)) {
> - printk(KERN_DEBUG "ieee80211_crypt_ccmp: could not allocate crypto API aes\n");
> + net_dbg_ratelimited("ieee80211_crypt_ccmp: could not allocate crypto API aes\n");
Why would this need to be ratelimited at all?
Same for the other changes in this file. Only use the _ratelimited()
calls if the message can be triggered a lot.
> @@ -276,22 +276,22 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
> keyidx = pos[3];
> if (!(keyidx & (1 << 5))) {
> if (net_ratelimit()) {
> - printk(KERN_DEBUG "CCMP: received packet without ExtIV flag from %pM\n",
> - hdr->addr2);
> + net_dbg_ratelimited("CCMP: received packet without ExtIV flag from %pM\n",
> + hdr->addr2);
Also, "ratelimit" is already checked right above this, so that's a hint
you don't need to check it again :)
thanks,
greg k-h