[PATCH] mac80211: Turn off meaningless TKIP message when software WEP encryption is used

[PATCH] mac80211: Turn off meaningless TKIP message when software WEP encryption is used

[Larry Finger]

For drivers that do no hardware encryption/decryption, WEP encryption
works as long as IEEE80211_HW_INCLUDE_IV is not set in the flags variable.
With WPA encryption and IEEE80211_HW_INCLUDE_IV not set, the logs are full
of TKIP decrypt failure messages. Despite the messages, RX is working.
This patch turns off the message for this case.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
---

 wpa.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Index: wireless-legacy/net/mac80211/wpa.c
===================================================================
--- wireless-legacy.orig/net/mac80211/wpa.c
+++ wireless-legacy/net/mac80211/wpa.c
@@ -516,9 +516,11 @@ ieee80211_rx_h_tkip_decrypt(struct ieee8
 					  skb->len - hdrlen, rx->sta->addr,
 					  hwaccel, rx->u.rx.queue);
 	if (res != TKIP_DECRYPT_OK || wpa_test) {
-		printk(KERN_DEBUG "%s: TKIP decrypt failed for RX frame from "
-		       MAC_FMT " (res=%d)\n",
-		       rx->dev->name, MAC_ARG(rx->sta->addr), res);
+		if ((rx->local->hw.flags & IEEE80211_HW_WEP_INCLUDE_IV)) {
+			printk(KERN_DEBUG "%s: TKIP decrypt failed for RX frame from "
+			       MAC_FMT " (res=%d)\n",
+			       rx->dev->name, MAC_ARG(rx->sta->addr), res);
+		}
 		return TXRX_DROP;
 	}
 

Re: [PATCH] mac80211: Turn off meaningless TKIP message when software WEP encryption is used

[John W. Linville]

On Mon, Aug 13, 2007 at 02:26:26PM -0500, Larry Finger wrote:

> --- wireless-legacy.orig/net/mac80211/wpa.c
> +++ wireless-legacy/net/mac80211/wpa.c
> @@ -516,9 +516,11 @@ ieee80211_rx_h_tkip_decrypt(struct ieee8
>  					  skb->len - hdrlen, rx->sta->addr,
>  					  hwaccel, rx->u.rx.queue);
>  	if (res != TKIP_DECRYPT_OK || wpa_test) {
> -		printk(KERN_DEBUG "%s: TKIP decrypt failed for RX frame from "
> -		       MAC_FMT " (res=%d)\n",
> -		       rx->dev->name, MAC_ARG(rx->sta->addr), res);
> +		if ((rx->local->hw.flags & IEEE80211_HW_WEP_INCLUDE_IV)) {
> +			printk(KERN_DEBUG "%s: TKIP decrypt failed for RX frame from "
> +			       MAC_FMT " (res=%d)\n",
> +			       rx->dev->name, MAC_ARG(rx->sta->addr), res);
> +		}
>  		return TXRX_DROP;
>  	}

Since you are in there anyway, should this be rate limited?

John
-- 
John W. Linville
linville@tuxdriver.com