drop mac80211 patch from 4.14 and 4.16

diff --git a/queue-4.14/mac80211-don-t-warn-on-bad-wmm-parameters-from-buggy-aps.patch b/queue-4.14/mac80211-don-t-warn-on-bad-wmm-parameters-from-buggy-aps.patch
deleted file mode 100644 (file)
index 5e0157f..0000000
--- a/queue-4.14/mac80211-don-t-warn-on-bad-wmm-parameters-from-buggy-aps.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From foo@baz Tue May  1 16:18:20 PDT 2018
-From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
-Date: Mon, 26 Mar 2018 16:21:04 +0300
-Subject: mac80211: don't WARN on bad WMM parameters from buggy APs
-
-From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
-
-[ Upstream commit c470bdc1aaf36669e04ba65faf1092b2d1c6cabe ]
-
-Apparently, some APs are buggy enough to send a zeroed
-WMM IE. Don't WARN on this since this is not caused by a bug
-on the client's system.
-
-This aligns the condition of the WARNING in drv_conf_tx
-with the validity check in ieee80211_sta_wmm_params.
-We will now pick the default values whenever we get
-a zeroed WMM IE.
-
-This has been reported here:
-https://bugzilla.kernel.org/show_bug.cgi?id=199161
-
-Fixes: f409079bb678 ("mac80211: sanity check CW_min/CW_max towards driver")
-Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- net/mac80211/mlme.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/net/mac80211/mlme.c
-+++ b/net/mac80211/mlme.c
-@@ -1797,7 +1797,8 @@ static bool ieee80211_sta_wmm_params(str
-               params[ac].acm = acm;
-               params[ac].uapsd = uapsd;
- 
--              if (params[ac].cw_min > params[ac].cw_max) {
-+              if (params->cw_min == 0 ||
-+                  params[ac].cw_min > params[ac].cw_max) {
-                       sdata_info(sdata,
-                                  "AP has invalid WMM params (CWmin/max=%d/%d for ACI %d), using defaults\n",
-                                  params[ac].cw_min, params[ac].cw_max, aci);

diff --git a/queue-4.14/series b/queue-4.14/series
index 79b1d0aaa011b03e8480fe4d450c3baad8fec710..97b99ab7fc69a68e6ea7ec3500d085c1fe8365b3 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -362,7 +362,6 @@ drivers-macintosh-rack-meter-really-fix-bogus-memsets.patch
 acpi-acpi_pad-fix-memory-leak-in-power-saving-threads.patch
 powerpc-mpic-check-if-cpu_possible-in-mpic_physmask.patch
 ieee802154-ca8210-fix-uninitialised-data-read.patch
-mac80211-don-t-warn-on-bad-wmm-parameters-from-buggy-aps.patch
 ath10k-advertize-beacon_int_min_gcd.patch
 staging-bcm2835-audio-release-resources-on-module_exit.patch
 iommu-amd-take-into-account-that-alloc_dev_data-may-return-null.patch

diff --git a/queue-4.16/mac80211-don-t-warn-on-bad-wmm-parameters-from-buggy-aps.patch b/queue-4.16/mac80211-don-t-warn-on-bad-wmm-parameters-from-buggy-aps.patch
deleted file mode 100644 (file)
index a04ee2a..0000000
--- a/queue-4.16/mac80211-don-t-warn-on-bad-wmm-parameters-from-buggy-aps.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From foo@baz Tue May  1 14:59:17 PDT 2018
-From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
-Date: Mon, 26 Mar 2018 16:21:04 +0300
-Subject: mac80211: don't WARN on bad WMM parameters from buggy APs
-
-From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
-
-[ Upstream commit c470bdc1aaf36669e04ba65faf1092b2d1c6cabe ]
-
-Apparently, some APs are buggy enough to send a zeroed
-WMM IE. Don't WARN on this since this is not caused by a bug
-on the client's system.
-
-This aligns the condition of the WARNING in drv_conf_tx
-with the validity check in ieee80211_sta_wmm_params.
-We will now pick the default values whenever we get
-a zeroed WMM IE.
-
-This has been reported here:
-https://bugzilla.kernel.org/show_bug.cgi?id=199161
-
-Fixes: f409079bb678 ("mac80211: sanity check CW_min/CW_max towards driver")
-Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- net/mac80211/mlme.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/net/mac80211/mlme.c
-+++ b/net/mac80211/mlme.c
-@@ -1786,7 +1786,8 @@ static bool ieee80211_sta_wmm_params(str
-               params[ac].acm = acm;
-               params[ac].uapsd = uapsd;
- 
--              if (params[ac].cw_min > params[ac].cw_max) {
-+              if (params->cw_min == 0 ||
-+                  params[ac].cw_min > params[ac].cw_max) {
-                       sdata_info(sdata,
-                                  "AP has invalid WMM params (CWmin/max=%d/%d for ACI %d), using defaults\n",
-                                  params[ac].cw_min, params[ac].cw_max, aci);

diff --git a/queue-4.16/series b/queue-4.16/series
index 9a82ba252a3b51cec146363a9b8e216581e5e36a..9d631fb920968ede6f4ada52a6f8b89b1765d7e3 100644 (file)
--- a/queue-4.16/series
+++ b/queue-4.16/series
@@ -67,7 +67,6 @@ drivers-macintosh-rack-meter-really-fix-bogus-memsets.patch
 acpi-acpi_pad-fix-memory-leak-in-power-saving-threads.patch
 powerpc-mpic-check-if-cpu_possible-in-mpic_physmask.patch
 ieee802154-ca8210-fix-uninitialised-data-read.patch
-mac80211-don-t-warn-on-bad-wmm-parameters-from-buggy-aps.patch
 ath10k-advertize-beacon_int_min_gcd.patch
 staging-bcm2835-audio-release-resources-on-module_exit.patch
 iommu-amd-take-into-account-that-alloc_dev_data-may-return-null.patch