remove patches that broke things

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 (file)
index 3b2167a..0000000
--- 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 <alex.williamson@redhat.com>
-Date: Thu, 29 Nov 2012 14:07:59 -0700
-Subject: KVM: Fix user memslot overlap check
-
-From: Alex Williamson <alex.williamson@redhat.com>
-
-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 <alex.williamson@redhat.com>
-Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- 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 a5117a4c5b16b541e8778aba63edb02af45baf82..57a56f5964c58fb1a455e1acc1b2928fb10ad31f 100644 (file)
--- 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 (file)
index c2f613a..0000000
--- 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 <sgruszka@redhat.com>
-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 <sgruszka@redhat.com>
-
-commit ab9d6e4ffe192427ce9e93d4f927b0faaa8a941e upstream.
-
-This revert:
-
-commit be03d4a45c09ee5100d3aaaedd087f19bc20d01f
-Author: Andreas Hartmann <andihartmann@01019freenet.de>
-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 <f.pinamartins@gmail.com>
-Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- 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 e607c25e513214d01d08c03378cef6cb9fcf3f82..c72652835450a6f87263545371cedcdeb93c2a73 100644 (file)
--- 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 <gregkh@linuxfoundation.org>
 
 --- 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 7949b8de623753b301c3d2224a652526138c8fa9..52afb098acea4ba14949c8aef26f86a3b5e4b735 100644 (file)
--- 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