From: Greg Kroah-Hartman Date: Tue, 20 Jan 2015 19:22:26 +0000 (+0800) Subject: delete rtlwifi-rtl8192ce-set-fw_ready-flag.patch from 3.10 and 3.14 X-Git-Tag: v3.10.66~36 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cd01790a2d14d3ee5cd375a3bf79f510fc90f27e;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 3f127245733..00000000000 --- 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 -Date: Wed, 10 Dec 2014 14:38:29 -0600 -Subject: rtlwifi: rtl8192ce: Set fw_ready flag - -From: Larry Finger - -commit 9a1dce3a059111a7289680f4b8c0ec4f8736b6ee upstream. - -The setting of this flag was missed in previous modifications. - -Signed-off-by: Larry Finger -Signed-off-by: John W. Linville -Signed-off-by: Greg Kroah-Hartman - ---- - 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 8068fbca805..b502ebc840e 100644 --- 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 index 3f127245733..00000000000 --- 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 -Date: Wed, 10 Dec 2014 14:38:29 -0600 -Subject: rtlwifi: rtl8192ce: Set fw_ready flag - -From: Larry Finger - -commit 9a1dce3a059111a7289680f4b8c0ec4f8736b6ee upstream. - -The setting of this flag was missed in previous modifications. - -Signed-off-by: Larry Finger -Signed-off-by: John W. Linville -Signed-off-by: Greg Kroah-Hartman - ---- - 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 7594ac2d74c..5004461c603 100644 --- 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