---

yaml --- r: 88372 b: refs/heads/master c: b3fc9c6 h: refs/heads/master v: v3
git-mirror · Apr 15, 2008 · 155f0f1 · 155f0f1
1 parent b4f3d93
commit 155f0f1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git 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
@@ -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;
 }