From fb6f25f3c5cf75d516bda276f569b173a835d15c Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Sun, 31 May 2009 18:24:34 -0400 Subject: [PATCH] --- yaml --- r: 150666 b: refs/heads/master c: 729e9c7663190d71fe5e29831634df80f38199c1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/wireless/reg.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index dc1a73199b1f..c40bffa5aa32 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3b8bcfd5d31ea0fec58681d035544ace707d2536 +refs/heads/master: 729e9c7663190d71fe5e29831634df80f38199c1 diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c index f87ac1df2df5..ea4c299fbe3b 100644 --- a/trunk/net/wireless/reg.c +++ b/trunk/net/wireless/reg.c @@ -2171,7 +2171,13 @@ static int __set_regdom(const struct ieee80211_regdomain *rd) * the country IE rd with what CRDA believes that country should have */ - BUG_ON(!country_ie_regdomain); + /* + * Userspace could have sent two replies with only + * one kernel request. By the second reply we would have + * already processed and consumed the country_ie_regdomain. + */ + if (!country_ie_regdomain) + return -EALREADY; BUG_ON(rd == country_ie_regdomain); /*