From 66fe1fe0101dd28ca488bb852762c2a1173df095 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 14 Jan 2013 06:25:53 -0800 Subject: [PATCH] remove patches that broke things --- .../kvm-fix-user-memslot-overlap-check.patch | 54 ----------------- queue-3.0/series | 1 - ...d-a-bar-when-an-ampdu-subframe-fails.patch | 60 ------------------- ...-more-then-one-interface-is-possible.patch | 2 +- queue-3.7/series | 1 - 5 files changed, 1 insertion(+), 117 deletions(-) delete mode 100644 queue-3.0/kvm-fix-user-memslot-overlap-check.patch delete mode 100644 queue-3.7/revert-rt2x00-don-t-let-mac80211-send-a-bar-when-an-ampdu-subframe-fails.patch diff --git a/queue-3.0/kvm-fix-user-memslot-overlap-check.patch b/queue-3.0/kvm-fix-user-memslot-overlap-check.patch deleted file mode 100644 index 3b2167a5568..00000000000 --- a/queue-3.0/kvm-fix-user-memslot-overlap-check.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 5419369ed6bd4cf711fdda5e52a5999b940413f5 Mon Sep 17 00:00:00 2001 -From: Alex Williamson -Date: Thu, 29 Nov 2012 14:07:59 -0700 -Subject: KVM: Fix user memslot overlap check - -From: Alex Williamson - -commit 5419369ed6bd4cf711fdda5e52a5999b940413f5 upstream. - -Prior to memory slot sorting this loop compared all of the user memory -slots for overlap with new entries. With memory slot sorting, we're -just checking some number of entries in the array that may or may not -be user slots. Instead, walk all the slots with kvm_for_each_memslot, -which has the added benefit of terminating early when we hit the first -empty slot, and skip comparison to private slots. - -Signed-off-by: Alex Williamson -Signed-off-by: Marcelo Tosatti -Signed-off-by: Greg Kroah-Hartman - ---- - virt/kvm/kvm_main.c | 13 +++++-------- - 1 file changed, 5 insertions(+), 8 deletions(-) - ---- a/virt/kvm/kvm_main.c -+++ b/virt/kvm/kvm_main.c -@@ -638,8 +638,7 @@ int __kvm_set_memory_region(struct kvm * - int r; - gfn_t base_gfn; - unsigned long npages; -- unsigned long i; -- struct kvm_memory_slot *memslot; -+ struct kvm_memory_slot *memslot, *slot; - struct kvm_memory_slot old, new; - struct kvm_memslots *slots, *old_memslots; - -@@ -686,13 +685,11 @@ int __kvm_set_memory_region(struct kvm * - - /* Check for overlaps */ - r = -EEXIST; -- for (i = 0; i < KVM_MEMORY_SLOTS; ++i) { -- struct kvm_memory_slot *s = &kvm->memslots->memslots[i]; -- -- if (s == memslot || !s->npages) -+ kvm_for_each_memslot(slot, kvm->memslots) { -+ if (slot->id >= KVM_MEMORY_SLOTS || slot == memslot) - continue; -- if (!((base_gfn + npages <= s->base_gfn) || -- (base_gfn >= s->base_gfn + s->npages))) -+ if (!((base_gfn + npages <= slot->base_gfn) || -+ (base_gfn >= slot->base_gfn + slot->npages))) - goto out_free; - } - diff --git a/queue-3.0/series b/queue-3.0/series index a5117a4c5b1..57a56f5964c 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -1,4 +1,3 @@ powerpc-fix-config_relocatable-y-config_crash_dump-n-build.patch powerpc-vdso-remove-redundant-locking-in-update_vsyscall_tz.patch -kvm-fix-user-memslot-overlap-check.patch s390-cio-fix-pgid-reserved-check.patch diff --git a/queue-3.7/revert-rt2x00-don-t-let-mac80211-send-a-bar-when-an-ampdu-subframe-fails.patch b/queue-3.7/revert-rt2x00-don-t-let-mac80211-send-a-bar-when-an-ampdu-subframe-fails.patch deleted file mode 100644 index c2f613a0bf4..00000000000 --- a/queue-3.7/revert-rt2x00-don-t-let-mac80211-send-a-bar-when-an-ampdu-subframe-fails.patch +++ /dev/null @@ -1,60 +0,0 @@ -From ab9d6e4ffe192427ce9e93d4f927b0faaa8a941e Mon Sep 17 00:00:00 2001 -From: Stanislaw Gruszka -Date: Mon, 3 Dec 2012 12:59:04 +0100 -Subject: Revert: "rt2x00: Don't let mac80211 send a BAR when an AMPDU subframe fails" - -From: Stanislaw Gruszka - -commit ab9d6e4ffe192427ce9e93d4f927b0faaa8a941e upstream. - -This revert: - -commit be03d4a45c09ee5100d3aaaedd087f19bc20d01f -Author: Andreas Hartmann -Date: Tue Apr 17 00:25:28 2012 +0200 - - rt2x00: Don't let mac80211 send a BAR when an AMPDU subframe fails - -To fix problem workaround by above commit use -IEEE80211_HW_TEARDOWN_AGGR_ON_BAR_FAIL flag (see change log for -"mac80211: introduce IEEE80211_HW_TEARDOWN_AGGR_ON_BAR_FAIL" patch). - -Resolve: https://bugzilla.kernel.org/show_bug.cgi?id=42828 -Bisected-by: Francisco Pina Martins -Signed-off-by: Stanislaw Gruszka -Signed-off-by: Johannes Berg -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/net/wireless/rt2x00/rt2800lib.c | 3 ++- - drivers/net/wireless/rt2x00/rt2x00dev.c | 7 +++---- - 2 files changed, 5 insertions(+), 5 deletions(-) - ---- a/drivers/net/wireless/rt2x00/rt2800lib.c -+++ b/drivers/net/wireless/rt2x00/rt2800lib.c -@@ -5036,7 +5036,8 @@ static int rt2800_probe_hw_mode(struct r - IEEE80211_HW_SUPPORTS_PS | - IEEE80211_HW_PS_NULLFUNC_STACK | - IEEE80211_HW_AMPDU_AGGREGATION | -- IEEE80211_HW_REPORTS_TX_ACK_STATUS; -+ IEEE80211_HW_REPORTS_TX_ACK_STATUS | -+ IEEE80211_HW_TEARDOWN_AGGR_ON_BAR_FAIL; - - /* - * Don't set IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING for USB devices ---- a/drivers/net/wireless/rt2x00/rt2x00dev.c -+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c -@@ -391,10 +391,9 @@ void rt2x00lib_txdone(struct queue_entry - tx_info->flags |= IEEE80211_TX_STAT_AMPDU; - tx_info->status.ampdu_len = 1; - tx_info->status.ampdu_ack_len = success ? 1 : 0; -- /* -- * TODO: Need to tear down BA session here -- * if not successful. -- */ -+ -+ if (!success) -+ tx_info->flags |= IEEE80211_TX_STAT_AMPDU_NO_BACK; - } - - if (rate_flags & IEEE80211_TX_RC_USE_RTS_CTS) { diff --git a/queue-3.7/rt2x00-only-specify-interface-combinations-if-more-then-one-interface-is-possible.patch b/queue-3.7/rt2x00-only-specify-interface-combinations-if-more-then-one-interface-is-possible.patch index e607c25e513..c7265283545 100644 --- a/queue-3.7/rt2x00-only-specify-interface-combinations-if-more-then-one-interface-is-possible.patch +++ b/queue-3.7/rt2x00-only-specify-interface-combinations-if-more-then-one-interface-is-possible.patch @@ -29,7 +29,7 @@ Signed-off-by: Greg Kroah-Hartman --- a/drivers/net/wireless/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c -@@ -1122,6 +1122,9 @@ static inline void rt2x00lib_set_if_comb +@@ -1123,6 +1123,9 @@ static inline void rt2x00lib_set_if_comb struct ieee80211_iface_limit *if_limit; struct ieee80211_iface_combination *if_combination; diff --git a/queue-3.7/series b/queue-3.7/series index 7949b8de623..52afb098ace 100644 --- a/queue-3.7/series +++ b/queue-3.7/series @@ -3,7 +3,6 @@ ath5k-fix-tx-path-skb-leaks.patch iwlwifi-don-t-handle-masked-interrupt.patch iwlwifi-silently-ignore-fw-flaws-in-tx-path.patch bcma-mips-fix-clearing-device-irq.patch -revert-rt2x00-don-t-let-mac80211-send-a-bar-when-an-ampdu-subframe-fails.patch rt2x00-only-specify-interface-combinations-if-more-then-one-interface-is-possible.patch s390-kvm-dont-announce-rrbm-support.patch s390-kvm-fix-address-space-mixup.patch -- 2.47.3