Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

1 files changed, 7 insertions, 1 deletions

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index f87ac1df2df5..ea4c299fbe3b 100644
--- a/net/wireless/reg.c
+++ b/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);
 
         /*