Revert "[BUGFIX] cfg80211: don't WARN if a self-managed device doesn't have a regdom"

This reverts the code to how it was before, now that we've
got the initial source of the problem fixed.

type=cleanup
ticket=none

Change-Id: Ic5a0a80897e45dc588f06fc76f47051c85da0b5c
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-on: https://git-amr-3.devtools.intel.com/gerrit/314515
automatic-review: ec ger unix iil jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
Reviewed-by: Grumbach, Emmanuel <emmanuel.grumbach@intel.com>
Tested-by: ec ger unix iil jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
Reviewed-by: Luciano Coelho <luciano.coelho@intel.com>
x-iwlwifi-stack-dev: bdfcef56ee887911fdcbf4dbb44b48fa4de14e03
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index ba21f60..26af25b 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -7684,8 +7684,8 @@
 			       REGULATORY_WIPHY_SELF_MANAGED;
 		regdom = get_wiphy_regdom(wiphy);
 
-		/* a self-managed-reg device should have a private regdom */
-		if (!regdom && self_managed) {
+		/* a self-managed-reg device must have a private regdom */
+		if (WARN_ON(!regdom && self_managed)) {
 			nlmsg_free(msg);
 			return -EINVAL;
 		}
diff --git a/versions b/versions
index bea58ed..1d10ef2 100644
--- a/versions
+++ b/versions
@@ -2,4 +2,4 @@
 BACKPORTED_KERNEL_VERSION="(see git)"
 BACKPORTED_KERNEL_NAME="iwlwifi"
 BACKPORTS_BUILD_TSTAMP=__DATE__ \" \" __TIME__
-BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:9235:66d33287"
+BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:9236:bdfcef56"