From b468f4c5441f782beccfe05ddfeecd8a12249459 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@fedoraproject.org>
Date: Dec 12 2014 14:40:10 +0000
Subject: Remove pointless warning in cfg80211 (rhbz 1172543)


---

diff --git a/cfg80211-don-t-WARN-about-two-consecutive-Country-IE.patch b/cfg80211-don-t-WARN-about-two-consecutive-Country-IE.patch
new file mode 100644
index 0000000..539f21c
--- /dev/null
+++ b/cfg80211-don-t-WARN-about-two-consecutive-Country-IE.patch
@@ -0,0 +1,42 @@
+From e95a7085483366d52dd93b9fe8258ea77b99b89a Mon Sep 17 00:00:00 2001
+From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
+Date: Tue, 2 Dec 2014 09:53:25 +0200
+Subject: [PATCH] cfg80211: don't WARN about two consecutive Country IE hint
+
+This can happen and there is no point in added more
+detection code lower in the stack. Catching these in one
+single point (cfg80211) is enough. Stop WARNING about this
+case.
+
+This fixes:
+https://bugzilla.kernel.org/show_bug.cgi?id=89001
+
+Cc: <stable@vger.kernel.org>
+Fixes: 2f1c6c572d7b ("cfg80211: process non country IE conflicting first")
+Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
+Acked-by: Luis R. Rodriguez <mcgrof@suse.com>
+---
+ net/wireless/reg.c | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/net/wireless/reg.c b/net/wireless/reg.c
+index b725a31a4751..695f12b2c176 100644
+--- a/net/wireless/reg.c
++++ b/net/wireless/reg.c
+@@ -1839,11 +1839,8 @@ __reg_process_hint_country_ie(struct wiphy *wiphy,
+ 			return REG_REQ_IGNORE;
+ 		return REG_REQ_ALREADY_SET;
+ 	}
+-	/*
+-	 * Two consecutive Country IE hints on the same wiphy.
+-	 * This should be picked up early by the driver/stack
+-	 */
+-	if (WARN_ON(regdom_changes(country_ie_request->alpha2)))
++
++	if (regdom_changes(country_ie_request->alpha2))
+ 		return REG_REQ_OK;
+ 	return REG_REQ_ALREADY_SET;
+ }
+-- 
+2.1.0
+
diff --git a/kernel.spec b/kernel.spec
index 7fc1dd2..51ffc9b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -632,6 +632,9 @@ Patch26094: uas-Add-US_FL_NO_REPORT_OPCODES-for-JMicron-JMS566-w.patch
 #rhbz 1084928
 Patch26095: ahci-disable-MSI-on-SAMSUNG-0xa800-SSD.patch
 
+#rhbz 1172543
+Patch26096: cfg80211-don-t-WARN-about-two-consecutive-Country-IE.patch
+
 # git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel
 Patch30000: kernel-arm64.patch
 
@@ -1374,6 +1377,9 @@ ApplyPatch uas-Add-US_FL_NO_REPORT_OPCODES-for-JMicron-JMS566-w.patch
 #rhbz 1084928
 ApplyPatch ahci-disable-MSI-on-SAMSUNG-0xa800-SSD.patch
 
+#rhbz 1172543
+ApplyPatch cfg80211-don-t-WARN-about-two-consecutive-Country-IE.patch
+
 %if 0%{?aarch64patches}
 ApplyPatch kernel-arm64.patch
 %ifnarch aarch64 # this is stupid, but i want to notice before secondary koji does.
@@ -2248,6 +2254,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Fri Dec 12 2014 Josh Boyer <jwboyer@fedoraproject.org>
+- Remove pointless warning in cfg80211 (rhbz 1172543)
+
 * Wed Dec 10 2014 Josh Boyer <jwboyer@fedoraproject.org>
 - Fix MSI issues on another Samsung pci-e SSD (rhbz 1084928)
 - Fix UAS crashes with Seagate and Fresco Logic drives (rhbz 1164945)