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

Commit 996bf99c authored Nov 06, 2015 by Johannes Berg

lib80211: ratelimit key index mismatch

This indicates a driver key selection issue, but even then there's
no point in printing it all the time, so ratelimit it. Also remove
the priv pointer from it -- people debugging will only have a single
device anyway and it's useless as anything but a cookie.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent d671b2a0

net/wireless/lib80211_crypt_ccmp.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -311,8 +311,8 @@ static int lib80211_ccmp_decrypt(struct sk_buff skb, int hdr_len, void priv)
	}		}
	keyidx >>= 6;		keyidx >>= 6;
	if (key->key_idx != keyidx) {		if (key->key_idx != keyidx) {
	printk(KERN_DEBUG "CCMP: RX tkey->key_idx=%d frame "		net_dbg_ratelimited("CCMP: RX tkey->key_idx=%d frame keyidx=%d\n",
	"keyidx=%d priv=%p\n", key->key_idx, keyidx, priv);		key->key_idx, keyidx);
	return -6;		return -6;
	}		}
	if (!key->key_set) {		if (!key->key_set) {

net/wireless/lib80211_crypt_tkip.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -434,8 +434,8 @@ static int lib80211_tkip_decrypt(struct sk_buff skb, int hdr_len, void priv)
	}		}
	keyidx >>= 6;		keyidx >>= 6;
	if (tkey->key_idx != keyidx) {		if (tkey->key_idx != keyidx) {
	printk(KERN_DEBUG "TKIP: RX tkey->key_idx=%d frame "		net_dbg_ratelimited("TKIP: RX tkey->key_idx=%d frame keyidx=%d\n",
	"keyidx=%d priv=%p\n", tkey->key_idx, keyidx, priv);		tkey->key_idx, keyidx);
	return -6;		return -6;
	}		}
	if (!tkey->key_set) {		if (!tkey->key_set) {