Hi all, Today's linux-next build (x86_64 allmodconfig) failed like this: net/wireless/reg.c:348:29: error: macro "if" passed 2 arguments, but takes just 1 net/wireless/reg.c: In function 'ignore_request': net/wireless/reg.c:349: error: expected '(' before 'return' This is clearly a bug in in the above file and should be fixed there, so I have applied the following patch for today. I expect some patch to fix this to appear in the wireless-current or net-current tree very soon. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/ diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 626dbb6..648c765 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -343,9 +343,7 @@ 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)), - "Invalid Country IE regulatory hint passed " - "to the wireless core\n") + if (WARN_ON(!is_alpha2_set(alpha2) || !is_an_alpha2(alpha2))) return -EINVAL; /* We ignore Country IE hints for now, as we haven't yet * added the dot11MultiDomainCapabilityEnabled flag -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html