delete rtlwifi-rtl8192ce-set-fw_ready-flag.patch from 3.10 and 3.14

diff --git a/queue-3.10/rtlwifi-rtl8192ce-set-fw_ready-flag.patch b/queue-3.10/rtlwifi-rtl8192ce-set-fw_ready-flag.patch
deleted file mode 100644 (file)
index 3f12724..0000000
--- a/queue-3.10/rtlwifi-rtl8192ce-set-fw_ready-flag.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 9a1dce3a059111a7289680f4b8c0ec4f8736b6ee Mon Sep 17 00:00:00 2001
-From: Larry Finger <Larry.Finger@lwfinger.net>
-Date: Wed, 10 Dec 2014 14:38:29 -0600
-Subject: rtlwifi: rtl8192ce: Set fw_ready flag
-
-From: Larry Finger <Larry.Finger@lwfinger.net>
-
-commit 9a1dce3a059111a7289680f4b8c0ec4f8736b6ee upstream.
-
-The setting of this flag was missed in previous modifications.
-
-Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
-Signed-off-by: John W. Linville <linville@tuxdriver.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/net/wireless/rtlwifi/rtl8192ce/hw.c |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
-+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
-@@ -951,6 +951,7 @@ int rtl92ce_hw_init(struct ieee80211_hw
-       local_save_flags(flags);
-       local_irq_enable();
- 
-+      rtlhal->fw_ready = false;
-       rtlpriv->intf_ops->disable_aspm(hw);
-       rtstatus = _rtl92ce_init_mac(hw);
-       if (!rtstatus) {
-@@ -967,6 +968,7 @@ int rtl92ce_hw_init(struct ieee80211_hw
-               goto exit;
-       }
- 
-+      rtlhal->fw_ready = true;
-       rtlhal->last_hmeboxnum = 0;
-       rtl92c_phy_mac_config(hw);
-       /* because last function modify RCR, so we update

diff --git a/queue-3.10/series b/queue-3.10/series
index 8068fbca805aa7b01e1b63226d005c861a49335e..b502ebc840edba6aac130f9c3fdeaf9a5308624c 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -11,6 +11,5 @@ drm-i915-invalidate-media-caches-on-gen7.patch
 drm-i915-force-the-cs-stall-for-invalidate-flushes.patch
 arc-move-peripherals-to-match-model-to-fpga.patch
 cfg80211-fix-160-mhz-channels-with-80-80-and-160-mhz-drivers.patch
-rtlwifi-rtl8192ce-set-fw_ready-flag.patch
 hp_accel-add-support-for-hp-zbook-15.patch
 iscsi-target-fail-connection-on-short-sendmsg-writes.patch

diff --git a/queue-3.14/rtlwifi-rtl8192ce-set-fw_ready-flag.patch b/queue-3.14/rtlwifi-rtl8192ce-set-fw_ready-flag.patch
deleted file mode 100644 (file)
index 3f12724..0000000
--- a/queue-3.14/rtlwifi-rtl8192ce-set-fw_ready-flag.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 9a1dce3a059111a7289680f4b8c0ec4f8736b6ee Mon Sep 17 00:00:00 2001
-From: Larry Finger <Larry.Finger@lwfinger.net>
-Date: Wed, 10 Dec 2014 14:38:29 -0600
-Subject: rtlwifi: rtl8192ce: Set fw_ready flag
-
-From: Larry Finger <Larry.Finger@lwfinger.net>
-
-commit 9a1dce3a059111a7289680f4b8c0ec4f8736b6ee upstream.
-
-The setting of this flag was missed in previous modifications.
-
-Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
-Signed-off-by: John W. Linville <linville@tuxdriver.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/net/wireless/rtlwifi/rtl8192ce/hw.c |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
-+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
-@@ -951,6 +951,7 @@ int rtl92ce_hw_init(struct ieee80211_hw
-       local_save_flags(flags);
-       local_irq_enable();
- 
-+      rtlhal->fw_ready = false;
-       rtlpriv->intf_ops->disable_aspm(hw);
-       rtstatus = _rtl92ce_init_mac(hw);
-       if (!rtstatus) {
-@@ -967,6 +968,7 @@ int rtl92ce_hw_init(struct ieee80211_hw
-               goto exit;
-       }
- 
-+      rtlhal->fw_ready = true;
-       rtlhal->last_hmeboxnum = 0;
-       rtl92c_phy_mac_config(hw);
-       /* because last function modify RCR, so we update

diff --git a/queue-3.14/series b/queue-3.14/series
index 7594ac2d74c1f8e5a10c6327d7aa029914ed5843..5004461c6033771a72caeefc8105418750d44c32 100644 (file)
--- a/queue-3.14/series
+++ b/queue-3.14/series
@@ -29,7 +29,6 @@ arc-switch-to-generic-entry-end-assembler-annotations.patch
 cfg80211-don-t-warn-about-two-consecutive-country-ie-hint.patch
 cfg80211-avoid-mem-leak-on-driver-hint-set.patch
 cfg80211-fix-160-mhz-channels-with-80-80-and-160-mhz-drivers.patch
-rtlwifi-rtl8192ce-set-fw_ready-flag.patch
 hp_accel-add-support-for-hp-zbook-15.patch
 tick-powerclamp-remove-tick_nohz_idle-abuse.patch
 genirq-prevent-proc-race-against-freeing-of-irq-descriptors.patch