summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-11-23 20:09:54 +0100
committerJohn W. Linville <linville@tuxdriver.com>2008-11-25 22:13:09 +0100
commit020cf6ba7a91ccc5db359f91e9abba175fd3a0aa (patch)
tree5a6b21a4e81d69bcb550e38a136d35f800b726f8
parentath5k: disable beacon filter when station is not associated (diff)
downloadlinux-020cf6ba7a91ccc5db359f91e9abba175fd3a0aa.tar.xz
linux-020cf6ba7a91ccc5db359f91e9abba175fd3a0aa.zip
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>
-rw-r--r--net/wireless/reg.c4
1 files changed, 2 insertions, 2 deletions
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