From: Ingo Molnar <mingo@elte.hu>
Date: Sun, 23 Nov 2008 19:09:54 +0000 (+0100)
Subject: net/wireless/reg.c: fix bad WARN_ON in if statement
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=020cf6ba7a91ccc5db359f91e9abba175fd3a0aa;p=openwrt%2Fstaging%2Fblogic.git

net/wireless/reg.c: fix bad WARN_ON in if statement

fix:

  net/wireless/reg.c:348:29: error: macro "if" passed 2 arguments, but takes just 1

triggered by the branch-tracer.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 626dbb688499..eb3b1a9f9b12 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -343,9 +343,9 @@ static int ignore_request(struct wiphy *wiphy, enum reg_set_by set_by,
 				return 0;
 			return -EALREADY;
 		}
-		if (WARN_ON(!is_alpha2_set(alpha2) || !is_an_alpha2(alpha2)),
+		if (WARN(!is_alpha2_set(alpha2) || !is_an_alpha2(alpha2),
 				"Invalid Country IE regulatory hint passed "
-				"to the wireless core\n")
+				"to the wireless core\n"))
 			return -EINVAL;
 		/* We ignore Country IE hints for now, as we haven't yet
 		 * added the dot11MultiDomainCapabilityEnabled flag