sky2 patches added

diff --git a/queue-2.6.18/series b/queue-2.6.18/series
index a9b161ea5d39a20070be324c7a48ddf451beb461..0f58254827d3e96d0373f52713756a731b68713c 100644 (file)
--- a/queue-2.6.18/series
+++ b/queue-2.6.18/series
@@ -18,3 +18,5 @@ fix-longstanding-load-balancing-bug-in-the-scheduler.patch
 zone_reclaim-dynamic-slab-reclaim.patch
 mv643xx_eth-fix-obvious-typo-which-caused-build-breakage.patch
 netdrvr-lp486e-fix-typo.patch
+sky2-tx-pause-bug-fix.patch
+sky2-network-driver-device-ids.patch

diff --git a/queue-2.6.18/sky2-network-driver-device-ids.patch b/queue-2.6.18/sky2-network-driver-device-ids.patch
new file mode 100644 (file)
index 0000000..1f4eda3
--- /dev/null
+++ b/queue-2.6.18/sky2-network-driver-device-ids.patch
@@ -0,0 +1,47 @@
+From stable-bounces@linux.kernel.org Sat Sep 23 13:56:56 2006
+Date: Sat, 23 Sep 2006 13:56:03 -0700
+From: Stephen Hemminger <shemminger@osdl.org>
+To: Andrew Morton <akpm@osdl.org>
+Message-ID: <20060923135603.51a30ca3@localhost.localdomain>
+Cc: stable@kernel.org, Jeff Garzik <jeff@garzik.org>
+Subject: sky2 network driver device ids
+
+From: Stephen Hemminger <shemminger@osdl.org>
+
+This makes the id table match the current netdev upstream tree.
+
+From: Stephen Hemminger <shemminger@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/net/sky2.c |    8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- linux-2.6.18.orig/drivers/net/sky2.c
++++ linux-2.6.18/drivers/net/sky2.c
+@@ -106,6 +106,7 @@ static const struct pci_device_id sky2_i
+       { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9000) },
+       { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9E00) },
+       { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4b00) },    /* DGE-560T */
++      { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4001) },    /* DGE-550SX */
+       { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4340) },
+       { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4341) },
+       { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4342) },
+@@ -117,10 +118,17 @@ static const struct pci_device_id sky2_i
+       { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4350) },
+       { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4351) },
+       { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4352) },
++      { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4353) },
+       { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4360) },
+       { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4361) },
+       { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4362) },
+       { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4363) },
++      { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4364) },
++      { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4365) },
++      { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4366) },
++      { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4367) },
++      { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4368) },
++      { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4369) },
+       { 0 }
+ };
+ 

diff --git a/queue-2.6.18/sky2-tx-pause-bug-fix.patch b/queue-2.6.18/sky2-tx-pause-bug-fix.patch
new file mode 100644 (file)
index 0000000..d5cef2e
--- /dev/null
+++ b/queue-2.6.18/sky2-tx-pause-bug-fix.patch
@@ -0,0 +1,33 @@
+From stable-bounces@linux.kernel.org Wed Sep 20 10:28:41 2006
+Date: Wed, 20 Sep 2006 10:27:48 -0700
+From: Stephen Hemminger <shemminger@osdl.org>
+To: stable@kernel.org
+Message-ID: <20060920102748.7225f1a9@localhost.localdomain>
+Subject: sky2: tx pause bug fix
+
+The sky2 driver will hang if transmit flow control is enabled
+and it receives a pause frame. The pause frame gets partially
+processed by hardware but never makes it through to the correct
+logic. This patch made it into 2.6.17 stable, but never got
+accepted for 2.6.18, so it will have to go into 2.6.18.1
+
+See also: http://bugzilla.kernel.org/show_bug.cgi?id=6839
+
+Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/net/sky2.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- linux-2.6.18.orig/drivers/net/sky2.h
++++ linux-2.6.18/drivers/net/sky2.h
+@@ -1566,7 +1566,7 @@ enum {
+ 
+       GMR_FS_ANY_ERR  = GMR_FS_RX_FF_OV | GMR_FS_CRC_ERR |
+                         GMR_FS_FRAGMENT | GMR_FS_LONG_ERR |
+-                        GMR_FS_MII_ERR | GMR_FS_BAD_FC | GMR_FS_GOOD_FC |
++                        GMR_FS_MII_ERR | GMR_FS_BAD_FC |
+                         GMR_FS_UN_SIZE | GMR_FS_JABBER,
+ };
+