lkml.org 
[lkml]   [2008]   [Nov]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] net/wireless/reg.c: fix

* Ingo Molnar <mingo@elte.hu> wrote:

> -tip testing found this build failure:
>
> net/wireless/reg.c:348:29: error: macro "if" passed 2 arguments, but takes just 1
>
> with the attached config. Seems the macro confused some aspect of WARN()

looks like a genuine bug in net/wireless/reg.c.

accidentally gcc was too willing to build this nonsense:

if (WARN_ON(!is_alpha2_set(alpha2) || !is_an_alpha2(alpha2)),
"Invalid Country IE regulatory hint passed "
"to the wireless core\n")

the fix is to use WARN(), which the intention was most likely.

Ingo

------------------->
From de734ba59d249ee785a1ead600e5a6ea1dd62639 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Sun, 23 Nov 2008 20:09:54 +0100
Subject: [PATCH] net/wireless/reg.c: fix

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>
# Please enter the commit message for your changes. Lines starting
---
net/wireless/reg.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 626dbb6..eb3b1a9 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

\
 
 \ /
  Last update: 2008-11-23 17:11    [W:0.131 / U:1.688 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site