1 files changed, 10 insertions, 0 deletions

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 7ecb9033ad42..5456534bdf8c 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1157,6 +1157,16 @@ static int ignore_request(struct wiphy *wiphy, enum reg_set_by set_by,
                                 return 0;
                         return -EALREADY;
                 }
+
+                /*
+                 * This would happen if you unplug and plug your card
+                 * back in or if you add a new device for which the previously
+                 * loaded card also agrees on the regulatory domain.
+                 */
+                if (last_request->initiator == REGDOM_SET_BY_DRIVER &&
+                    alpha2_equal(cfg80211_regdomain->alpha2, alpha2))
+                        return -EALREADY;
+
                 return REG_INTERSECT;
         case REGDOM_SET_BY_USER:
                 if (last_request->initiator == REGDOM_SET_BY_COUNTRY_IE)