From 155f0f139b4e760fe4ad4727e64ca3e3bc5f5403 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Sun, 13 Apr 2008 10:12:47 +0200
Subject: [PATCH] --- yaml --- r: 88372 b: refs/heads/master c:
 b3fc9c6c58c986f7a24fd8b0794d1e0794935a28 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/net/mac80211/rx.c | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index c5e87db9e055..e5410e289650 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2dd0f69222c481574baf6a4affb9256a7c7410e7
+refs/heads/master: b3fc9c6c58c986f7a24fd8b0794d1e0794935a28
diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c
index 535407d07fa4..a8a40aba846b 100644
--- a/trunk/net/mac80211/rx.c
+++ b/trunk/net/mac80211/rx.c
@@ -1050,12 +1050,9 @@ ieee80211_drop_unencrypted(struct ieee80211_txrx_data *rx)
 	if (unlikely(!(rx->fc & IEEE80211_FCTL_PROTECTED) &&
 		     (rx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA &&
 		     (rx->fc & IEEE80211_FCTL_STYPE) != IEEE80211_STYPE_NULLFUNC &&
-		     (rx->key || rx->sdata->drop_unencrypted))) {
-		if (net_ratelimit())
-			printk(KERN_DEBUG "%s: RX non-WEP frame, but expected "
-			       "encryption\n", rx->dev->name);
+		     (rx->key || rx->sdata->drop_unencrypted)))
 		return -EACCES;
-	}
+
 	return 0;
 }