From e07878903e6521289fa33c496183c1a1d082cec6 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Mon, 26 Nov 2012 12:51:52 +0100
Subject: [PATCH] --- yaml --- r: 341971 b: refs/heads/master c:
 d9d8b01978f6510a262ddc4da3b3694d5b149cfe h: refs/heads/master i:   341969:
 2d2f9dd09fb65d76c7a1efc4df3b231e02d3fc69   341967:
 c729527f0791f733cbc721cf0203d68fa5549b89 v: v3

---
 [refs]                       | 2 +-
 trunk/net/wireless/nl80211.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 39c6c6c581b9..d61f1ea525f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 339afbf4819e5c7c0a0422af43b8c2eccd059abf
+refs/heads/master: d9d8b01978f6510a262ddc4da3b3694d5b149cfe
diff --git a/trunk/net/wireless/nl80211.c b/trunk/net/wireless/nl80211.c
index 7f53aafd47f7..7cce43bc9489 100644
--- a/trunk/net/wireless/nl80211.c
+++ b/trunk/net/wireless/nl80211.c
@@ -6555,14 +6555,13 @@ nl80211_attr_cqm_policy[NL80211_ATTR_CQM_MAX + 1] __read_mostly = {
 };
 
 static int nl80211_set_cqm_txe(struct genl_info *info,
-				u32 rate, u32 pkts, u32 intvl)
+			       u32 rate, u32 pkts, u32 intvl)
 {
 	struct cfg80211_registered_device *rdev = info->user_ptr[0];
 	struct wireless_dev *wdev;
 	struct net_device *dev = info->user_ptr[1];
 
-	if ((rate < 0 || rate > 100) ||
-	    (intvl < 0 || intvl > NL80211_CQM_TXE_MAX_INTVL))
+	if (rate > 100 || intvl > NL80211_CQM_TXE_MAX_INTVL)
 		return -EINVAL;
 
 	wdev = dev->ieee80211_ptr;