Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f3ad894 authored by John W. Linville's avatar John W. Linville Committed by David S. Miller
Browse files

mac80211: make "decrypt failed" messages conditional upon MAC80211_DEBUG 



Make "decrypt failed" and "have no key" debugging messages compile
conditionally upon CONFIG_MAC80211_DEBUG.  They have been useful for
finding certain problems in the past, but in many cases they just
clutter a user's logs.

A typical example is an enviornment where multiple SSIDs are using a
single BSSID but with different protection schemes or different keys
for each SSID.  In such an environment these messages are just noise.
Let's just leave them for those interested enough to turn-on debugging.

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5b98b1f7

net/mac80211/rx.c

+2 −0
Original line number Diff line number Diff line
@@ -509,9 +509,11 @@ ieee80211_rx_h_decrypt(struct ieee80211_txrx_data *rx) 
		rx->key->tx_rx_count++;

		/* TODO: add threshold stuff again */

	} else {

#ifdef CONFIG_MAC80211_DEBUG

		if (net_ratelimit())

			printk(KERN_DEBUG "%s: RX protected frame,"

			       " but have no key\n", rx->dev->name);

#endif /* CONFIG_MAC80211_DEBUG */

		return TXRX_DROP;

	}

net/mac80211/wep.c

+2 −0
Original line number Diff line number Diff line
@@ -314,9 +314,11 @@ ieee80211_crypto_wep_decrypt(struct ieee80211_txrx_data *rx) 


	if (!(rx->u.rx.status->flag & RX_FLAG_DECRYPTED)) {

		if (ieee80211_wep_decrypt(rx->local, rx->skb, rx->key)) {

#ifdef CONFIG_MAC80211_DEBUG

			if (net_ratelimit())

				printk(KERN_DEBUG "%s: RX WEP frame, decrypt "

				       "failed\n", rx->dev->name);

#endif /* CONFIG_MAC80211_DEBUG */

			return TXRX_DROP;

		}

	} else if (!(rx->u.rx.status->flag & RX_FLAG_IV_STRIPPED)) {

net/mac80211/wpa.c

+12 −6
Original line number Diff line number Diff line
@@ -323,9 +323,12 @@ ieee80211_crypto_tkip_decrypt(struct ieee80211_txrx_data *rx) 
					  &rx->u.rx.tkip_iv32,

					  &rx->u.rx.tkip_iv16);

	if (res != TKIP_DECRYPT_OK || wpa_test) {

		printk(KERN_DEBUG "%s: TKIP decrypt failed for RX frame from "

		       "%s (res=%d)\n",

		       rx->dev->name, print_mac(mac, rx->sta->addr), res);

#ifdef CONFIG_MAC80211_DEBUG

		if (net_ratelimit())

			printk(KERN_DEBUG "%s: TKIP decrypt failed for RX "

			       "frame from %s (res=%d)\n", rx->dev->name,

			       print_mac(mac, rx->sta->addr), res);

#endif /* CONFIG_MAC80211_DEBUG */

		return TXRX_DROP;

	}
@@ -594,9 +597,12 @@ ieee80211_crypto_ccmp_decrypt(struct ieee80211_txrx_data *rx) 
			    skb->data + hdrlen + CCMP_HDR_LEN, data_len,

			    skb->data + skb->len - CCMP_MIC_LEN,

			    skb->data + hdrlen + CCMP_HDR_LEN)) {

			printk(KERN_DEBUG "%s: CCMP decrypt failed for RX "

			       "frame from %s\n", rx->dev->name,

#ifdef CONFIG_MAC80211_DEBUG

			if (net_ratelimit())

				printk(KERN_DEBUG "%s: CCMP decrypt failed "

				       "for RX frame from %s\n", rx->dev->name,

				       print_mac(mac, rx->sta->addr));

#endif /* CONFIG_MAC80211_DEBUG */

			return TXRX_DROP;

		}

	}