remove iwmc3200wifi-fix-array-out-of-boundary-access.patch from .31 series

diff --git a/review-2.6.31/iwmc3200wifi-fix-array-out-of-boundary-access.patch b/review-2.6.31/iwmc3200wifi-fix-array-out-of-boundary-access.patch
deleted file mode 100644 (file)
index 63b0f42..0000000
--- a/review-2.6.31/iwmc3200wifi-fix-array-out-of-boundary-access.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 6c853da3f30c93eae847ecbcd9fdf10ba0da04c2 Mon Sep 17 00:00:00 2001
-From: Zhu Yi <yi.zhu@intel.com>
-Date: Mon, 28 Dec 2009 14:23:11 +0800
-Subject: iwmc3200wifi: fix array out-of-boundary access
-
-From: Zhu Yi <yi.zhu@intel.com>
-
-commit 6c853da3f30c93eae847ecbcd9fdf10ba0da04c2 upstream.
-
-Allocate priv->rx_packets[IWM_RX_ID_HASH + 1] because the max array
-index is IWM_RX_ID_HASH according to IWM_RX_ID_GET_HASH().
-
-Signed-off-by: Zhu Yi <yi.zhu@intel.com>
-Signed-off-by: John W. Linville <linville@tuxdriver.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/net/wireless/iwmc3200wifi/iwm.h |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/net/wireless/iwmc3200wifi/iwm.h
-+++ b/drivers/net/wireless/iwmc3200wifi/iwm.h
-@@ -268,7 +268,7 @@ struct iwm_priv {
- 
-       struct sk_buff_head rx_list;
-       struct list_head rx_tickets;
--      struct list_head rx_packets[IWM_RX_ID_HASH];
-+      struct list_head rx_packets[IWM_RX_ID_HASH + 1];
-       struct workqueue_struct *rx_wq;
-       struct work_struct rx_worker;
- 

diff --git a/review-2.6.31/series b/review-2.6.31/series
index 892f5aa173c671cf8ec7b6a344be88f481002559..6f766f524c422d85d06e2e4a922b4c46fea6a433 100644 (file)
--- a/review-2.6.31/series
+++ b/review-2.6.31/series
@@ -4,7 +4,6 @@ cifs-null-out-tcon-psesinfo-and-srvtcp-pointers-when-chasing-dfs-referrals.patch
 clockevents-prevent-clockevent_devices-list-corruption-on-cpu-hotplug.patch
 dma-at_hdmac-correct-incompatible-type-for-argument-1-of-spin_lock_bh.patch
 drivers-net-usb-correct-code-taking-the-size-of-a-pointer.patch
-iwmc3200wifi-fix-array-out-of-boundary-access.patch
 libertas-fix-buffer-overflow-in-lbs_get_essid.patch
 md-fix-unfortunate-interaction-with-evms.patch
 pata_cmd64x-fix-overclocking-of-udma0-2-modes.patch