added ipw2200 patch from intel (in mainline) and added signed-off-by from me

diff --git a/queue-2.6.16/altix-correct-ioc3-port-order.patch b/queue-2.6.16/altix-correct-ioc3-port-order.patch
index b3fc76071f2b2100e6a718fbbb99b0ceaa1d9158..f98f2d422e6603cc0a077282ed5a7432ee676e2f 100644 (file)
--- a/queue-2.6.16/altix-correct-ioc3-port-order.patch
+++ b/queue-2.6.16/altix-correct-ioc3-port-order.patch
@@ -17,8 +17,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  drivers/sn/ioc3.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- linux-2.6.16.16.orig/drivers/sn/ioc3.c
-+++ linux-2.6.16.16/drivers/sn/ioc3.c
+--- linux-2.6.16.19.orig/drivers/sn/ioc3.c
++++ linux-2.6.16.19/drivers/sn/ioc3.c
 @@ -677,7 +677,7 @@ static int ioc3_probe(struct pci_dev *pd
        /* Track PCI-device specific data */
        pci_set_drvdata(pdev, idd);

diff --git a/queue-2.6.16/altix-correct-ioc4-port-order.patch b/queue-2.6.16/altix-correct-ioc4-port-order.patch
index 58e138348724c93c6a10cd6de2e8a1f9760f0b96..a94f56985c353d6175bdcab2d6305ec1a9df4681 100644 (file)
--- a/queue-2.6.16/altix-correct-ioc4-port-order.patch
+++ b/queue-2.6.16/altix-correct-ioc4-port-order.patch
@@ -18,8 +18,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  drivers/sn/ioc4.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- linux-2.6.16.16.orig/drivers/sn/ioc4.c
-+++ linux-2.6.16.16/drivers/sn/ioc4.c
+--- linux-2.6.16.19.orig/drivers/sn/ioc4.c
++++ linux-2.6.16.19/drivers/sn/ioc4.c
 @@ -313,7 +313,7 @@ ioc4_probe(struct pci_dev *pdev, const s
        idd->idd_serial_data = NULL;
        pci_set_drvdata(idd->idd_pdev, idd);

diff --git a/queue-2.6.16/cpuset-might-sleep-checking-zones-allowed-fix.patch b/queue-2.6.16/cpuset-might-sleep-checking-zones-allowed-fix.patch
index e19170be2820da0c622739db38b794c20cf8c150..fb14b4b2254025a775c08d5b694084b59fabf568 100644 (file)
--- a/queue-2.6.16/cpuset-might-sleep-checking-zones-allowed-fix.patch
+++ b/queue-2.6.16/cpuset-might-sleep-checking-zones-allowed-fix.patch
@@ -48,13 +48,14 @@ back in Nov 2005, before I was ready to listen.
 
 Signed-off-by: Paul Jackson <pj@sgi.com>
 Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
 
  mm/page_alloc.c |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
---- linux-2.6.16.18.orig/mm/page_alloc.c
-+++ linux-2.6.16.18/mm/page_alloc.c
+--- linux-2.6.16.19.orig/mm/page_alloc.c
++++ linux-2.6.16.19/mm/page_alloc.c
 @@ -949,7 +949,8 @@ restart:
                alloc_flags |= ALLOC_HARDER;
        if (gfp_mask & __GFP_HIGH)

diff --git a/queue-2.6.16/input-psmouse-fix-new-device-detection-logic.patch b/queue-2.6.16/input-psmouse-fix-new-device-detection-logic.patch
index f1bc29c9fba57a0ae33d1291aac0ec89ca74919d..81af50c9812e195b61a4858c19f72d7cf878b0d9 100644 (file)
--- a/queue-2.6.16/input-psmouse-fix-new-device-detection-logic.patch
+++ b/queue-2.6.16/input-psmouse-fix-new-device-detection-logic.patch
@@ -10,13 +10,14 @@ Reported to fix http://bugs.gentoo.org/130846
 Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
 Cc: Daniel Drake <dsd@gentoo.org>
 Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
 
  drivers/input/mouse/psmouse-base.c |    4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
---- linux-2.6.16.18.orig/drivers/input/mouse/psmouse-base.c
-+++ linux-2.6.16.18/drivers/input/mouse/psmouse-base.c
+--- linux-2.6.16.19.orig/drivers/input/mouse/psmouse-base.c
++++ linux-2.6.16.19/drivers/input/mouse/psmouse-base.c
 @@ -300,8 +300,10 @@ static irqreturn_t psmouse_interrupt(str
   * Check if this is a new device announcement (0xAA 0x00)
   */

diff --git a/queue-2.6.16/ipw2200-Filter-unsupported-channels-out-in-ad-hoc-mode.patch b/queue-2.6.16/ipw2200-Filter-unsupported-channels-out-in-ad-hoc-mode.patch
new file mode 100644 (file)
index 0000000..663c472
--- /dev/null
+++ b/queue-2.6.16/ipw2200-Filter-unsupported-channels-out-in-ad-hoc-mode.patch
@@ -0,0 +1,54 @@
+From nobody Mon Sep 17 00:00:00 2001
+From: Zhu Yi <yi.zhu@intel.com>
+Date: Thu, 2 Mar 2006 05:55:51 +0800
+Subject: [PATCH] ipw2200: Filter unsupported channels out in ad-hoc mode
+
+Currently iwlist ethX freq[uency]/channel lists all the channels the card
+supported for the current region, which includes some channels can only
+be used in infrastructure mode. This patch filters these channels out if
+the card is currently in ad-hoc mode.
+
+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/ipw2200.c |   16 ++++++++++++----
+ 1 file changed, 12 insertions(+), 4 deletions(-)
+
+--- linux-2.6.16.19.orig/drivers/net/wireless/ipw2200.c
++++ linux-2.6.16.19/drivers/net/wireless/ipw2200.c
+@@ -8391,20 +8391,28 @@ static int ipw_wx_get_range(struct net_d
+ 
+       i = 0;
+       if (priv->ieee->mode & (IEEE_B | IEEE_G)) {
+-              for (j = 0; j < geo->bg_channels && i < IW_MAX_FREQUENCIES;
+-                   i++, j++) {
++              for (j = 0; j < geo->bg_channels && i < IW_MAX_FREQUENCIES; j++) {
++                      if ((priv->ieee->iw_mode == IW_MODE_ADHOC) &&
++                          (geo->bg[j].flags & IEEE80211_CH_PASSIVE_ONLY))
++                              continue;
++
+                       range->freq[i].i = geo->bg[j].channel;
+                       range->freq[i].m = geo->bg[j].freq * 100000;
+                       range->freq[i].e = 1;
++                      i++;
+               }
+       }
+ 
+       if (priv->ieee->mode & IEEE_A) {
+-              for (j = 0; j < geo->a_channels && i < IW_MAX_FREQUENCIES;
+-                   i++, j++) {
++              for (j = 0; j < geo->a_channels && i < IW_MAX_FREQUENCIES; j++) {
++                      if ((priv->ieee->iw_mode == IW_MODE_ADHOC) &&
++                          (geo->a[j].flags & IEEE80211_CH_PASSIVE_ONLY))
++                              continue;
++
+                       range->freq[i].i = geo->a[j].channel;
+                       range->freq[i].m = geo->a[j].freq * 100000;
+                       range->freq[i].e = 1;
++                      i++;
+               }
+       }
+ 

diff --git a/queue-2.6.16/ohci1394-sbp2-fix-scsi_add_device-failed-with-pl-3507-based-devices.patch b/queue-2.6.16/ohci1394-sbp2-fix-scsi_add_device-failed-with-pl-3507-based-devices.patch
index 99b1bbe14119ba9d28f4fc1c0543d340c5ef5add..42b13acc7db89d83add9dc24e081dbf934f5ed49 100644 (file)
--- a/queue-2.6.16/ohci1394-sbp2-fix-scsi_add_device-failed-with-pl-3507-based-devices.patch
+++ b/queue-2.6.16/ohci1394-sbp2-fix-scsi_add_device-failed-with-pl-3507-based-devices.patch
@@ -15,14 +15,15 @@ Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
 Tested-by: Vanei Heidemann <linux@javanei.com.br>
 Tested-by: Martin Putzlocher <mputzi@gmx.de> (chip type unconfirmed)
 Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
 
  drivers/ieee1394/ohci1394.c |    2 +-
  drivers/ieee1394/sbp2.c     |    9 +++++++--
  2 files changed, 8 insertions(+), 3 deletions(-)
 
---- linux-2.6.16.18.orig/drivers/ieee1394/ohci1394.c
-+++ linux-2.6.16.18/drivers/ieee1394/ohci1394.c
+--- linux-2.6.16.19.orig/drivers/ieee1394/ohci1394.c
++++ linux-2.6.16.19/drivers/ieee1394/ohci1394.c
 @@ -2525,7 +2525,7 @@ static irqreturn_t ohci_irq_handler(int 
                        if (phys_dma) {
                                reg_write(ohci,OHCI1394_PhyReqFilterHiSet, 0xffffffff);
@@ -32,8 +33,8 @@ Signed-off-by: Chris Wright <chrisw@sous-sol.org>
                        } else {
                                reg_write(ohci,OHCI1394_PhyReqFilterHiSet, 0x00000000);
                                reg_write(ohci,OHCI1394_PhyReqFilterLoSet, 0x00000000);
---- linux-2.6.16.18.orig/drivers/ieee1394/sbp2.c
-+++ linux-2.6.16.18/drivers/ieee1394/sbp2.c
+--- linux-2.6.16.19.orig/drivers/ieee1394/sbp2.c
++++ linux-2.6.16.19/drivers/ieee1394/sbp2.c
 @@ -754,11 +754,16 @@ static struct scsi_id_instance_data *sbp
  
        /* Register the status FIFO address range. We could use the same FIFO

diff --git a/queue-2.6.16/powermac-force-only-suspend-to-disk-to-be-valid.patch b/queue-2.6.16/powermac-force-only-suspend-to-disk-to-be-valid.patch
index a01f422765fc191a4afa9578bc439a6c35b6852c..2e523a298db1638f579bbbf7b24f976edf0893c6 100644 (file)
--- a/queue-2.6.16/powermac-force-only-suspend-to-disk-to-be-valid.patch
+++ b/queue-2.6.16/powermac-force-only-suspend-to-disk-to-be-valid.patch
@@ -20,13 +20,14 @@ Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
 Cc: <stable@kernel.org>
 Signed-off-by: Andrew Morton <akpm@osdl.org>
 Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
 
  arch/powerpc/platforms/powermac/setup.c |   12 ++++++++++++
  1 file changed, 12 insertions(+)
 
---- linux-2.6.16.18.orig/arch/powerpc/platforms/powermac/setup.c
-+++ linux-2.6.16.18/arch/powerpc/platforms/powermac/setup.c
+--- linux-2.6.16.19.orig/arch/powerpc/platforms/powermac/setup.c
++++ linux-2.6.16.19/arch/powerpc/platforms/powermac/setup.c
 @@ -456,11 +456,23 @@ static int pmac_pm_finish(suspend_state_
        return 0;
  }

diff --git a/queue-2.6.16/series b/queue-2.6.16/series
index 2487163fda636921629d0a552258e9eef2bd0dec..008feb2d03b57873f99234619e52bed0f9e940e7 100644 (file)
--- a/queue-2.6.16/series
+++ b/queue-2.6.16/series
@@ -5,3 +5,4 @@ powermac-force-only-suspend-to-disk-to-be-valid.patch
 input-psmouse-fix-new-device-detection-logic.patch
 ohci1394-sbp2-fix-scsi_add_device-failed-with-pl-3507-based-devices.patch
 the-latest-consensus-libata-resume-fix.patch
+ipw2200-Filter-unsupported-channels-out-in-ad-hoc-mode.patch

diff --git a/queue-2.6.16/the-latest-consensus-libata-resume-fix.patch b/queue-2.6.16/the-latest-consensus-libata-resume-fix.patch
index 1421a14925c9fcd9fc13e1cf5efb139a6fda0ce2..db2e24e92430c7739daf72110443994fa58b856a 100644 (file)
--- a/queue-2.6.16/the-latest-consensus-libata-resume-fix.patch
+++ b/queue-2.6.16/the-latest-consensus-libata-resume-fix.patch
@@ -15,6 +15,7 @@ Signed-off-by:  Mark Lord <liml@rtr.ca>
 Acked-by: Jens Axboe <axboe@suse.de>
 Signed-off-by: Jeff Garzik <jeff@garzik.org>
 Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 ---
 
  drivers/scsi/libata-core.c |    1 +