r1730 - in trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian: . patches patches/series

dilinger-guest@haydn.debian.org dilinger-guest@haydn.debian.org
Sat, 23 Oct 2004 00:54:44 -0600


Author: dilinger-guest
Date: 2004-10-23 00:51:29 -0600 (Sat, 23 Oct 2004)
New Revision: 1730

Removed:
   trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/drivers-net-typhoon-build-fix.dpatch
Modified:
   trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/changelog
   trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/series/2.6.9-1
   trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/tg3-update.dpatch
Log:
delete drivers-net-typhoon-build-fix.dpatch; it doesn't apply, as it
depends on stuff in bitkeeper.  I assume the build fix is necessary because
of previous ETHTOOL patches in bk.

Also, updated tg3 to not modify tg3.h.  It's fine the way it is.


Modified: trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/changelog	2004-10-23 06:40:51 UTC (rev 1729)
+++ trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/changelog	2004-10-23 06:51:29 UTC (rev 1730)
@@ -76,12 +76,15 @@
     . modular-ide.dpatch (triflex dropped /proc/ide/triflex)
     . modular-vesafb.dpatch
     . powerpc-ibm-240-e30.dpatch (partially merged)
+    . tg3-update.dpatch (no need to update tg3.h, it's not deleted)
 
   * Drop the following patches (Andres Salomon):
     . extraversion.dpatch (kernel now supports localversion; use that
       instead)
     . tcp_default_win_scale.dpatch (win_scale now auto-generated based
       on optimum max win scale.  hopefully it works!)
+    . drivers-net-typhoon-build-fix.dpatch (fixes ETHTOOL stuff that's
+      only in BK?)
  
   * Add build fixes for iSeries ppc64, typhoon, framemaster 2.
     (Maximilian Attems)

Deleted: trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/drivers-net-typhoon-build-fix.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/drivers-net-typhoon-build-fix.dpatch	2004-10-23 06:40:51 UTC (rev 1729)
+++ trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/drivers-net-typhoon-build-fix.dpatch	2004-10-23 06:51:29 UTC (rev 1730)
@@ -1,30 +0,0 @@
-#! /bin/sh -e 
-## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: typhoon build fix
-## DP: Patch author: jgarzik@redhat.com
-## DP: Upstream status: backport 2.6.9-bk5
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
-diff -Nru a/drivers/net/typhoon.c b/drivers/net/typhoon.c
---- a/drivers/net/typhoon.c	2004-10-21 06:17:22 -07:00
-+++ b/drivers/net/typhoon.c	2004-10-21 06:17:22 -07:00
-@@ -2469,14 +2469,13 @@
- 	dev->set_multicast_list	= typhoon_set_rx_mode;
- 	dev->tx_timeout		= typhoon_tx_timeout;
- 	dev->poll		= typhoon_poll;
--	dev->ethtool_ops	= &typhoon_ethtool_ops;
- 	dev->weight		= 16;
- 	dev->watchdog_timeo	= TX_TIMEOUT;
- 	dev->get_stats		= typhoon_get_stats;
- 	dev->set_mac_address	= typhoon_set_mac_address;
- 	dev->vlan_rx_register	= typhoon_vlan_rx_register;
- 	dev->vlan_rx_kill_vid	= typhoon_vlan_rx_kill_vid;
--	SET_ETHTOOL_OPS(dev, &ops);
-+	SET_ETHTOOL_OPS(dev, &typhoon_ethtool_ops);
- 
- 	/* We can handle scatter gather, up to 16 entries, and
- 	 * we can do IP checksumming (only version 4, doh...)

Modified: trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/series/2.6.9-1
===================================================================
--- trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/series/2.6.9-1	2004-10-23 06:40:51 UTC (rev 1729)
+++ trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/series/2.6.9-1	2004-10-23 06:51:29 UTC (rev 1730)
@@ -54,6 +54,5 @@
 + sparc64-hme-lockup.dpatch
 + ia64-mem-max_addr-cmdline-fix.dpatch
 + ppc64-iSeries-build-fix.dpatch
-+ drivers-net-typhoon-build-fix.dpatch
 + drivers-video-fm2fb-build-fix.dpatch
 + fs-ext3-directio-leak-fix.dpatch

Modified: trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/tg3-update.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/tg3-update.dpatch	2004-10-23 06:40:51 UTC (rev 1729)
+++ trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/tg3-update.dpatch	2004-10-23 06:51:29 UTC (rev 1730)
@@ -1465,82 +1465,3 @@
  	return 0;
  }
  
---- kernel-source-2.6.8/drivers/net/tg3.h	2004-08-14 07:36:18.000000000 +0200
-+++ linux-2.5/drivers/net/tg3.h	2004-09-18 13:46:34.954985520 +0200
-@@ -124,6 +124,7 @@
- #define  CHIPREV_ID_5705_A3		 0x3003
- #define  CHIPREV_ID_5750_A0		 0x4000
- #define  CHIPREV_ID_5750_A1		 0x4001
-+#define  CHIPREV_ID_5750_A3		 0x4003
- #define  GET_ASIC_REV(CHIP_REV_ID)	((CHIP_REV_ID) >> 12)
- #define   ASIC_REV_5700			 0x07
- #define   ASIC_REV_5701			 0x00
-@@ -1548,7 +1549,7 @@
-  * exist only in the cards on-chip SRAM.  All 16 send bds are under
-  * the same mode, they may not be configured individually.
-  *
-- * The mode we use is controlled by TG3_FLAG_HOST_TXDS in tp->tg3_flags.
-+ * This driver always uses host memory TX descriptors.
-  *
-  * To use host memory TX descriptors:
-  *	1) Set GRC_MODE_HOST_SENDBDS in GRC_MODE register.
-@@ -2004,7 +2005,6 @@
- 
- 	spinlock_t			tx_lock;
- 
--	/* TX descs are only used if TG3_FLAG_HOST_TXDS is set. */
- 	struct tg3_tx_buffer_desc	*tx_ring;
- 	struct tx_ring_info		*tx_buffers;
- 	dma_addr_t			tx_desc_mapping;
-@@ -2040,7 +2040,6 @@
- 
- 	u32				rx_offset;
- 	u32				tg3_flags;
--#define TG3_FLAG_HOST_TXDS		0x00000001
- #define TG3_FLAG_TXD_MBOX_HWBUG		0x00000002
- #define TG3_FLAG_RX_CHECKSUMS		0x00000004
- #define TG3_FLAG_USE_LINKCHG_REG	0x00000008
-@@ -2070,15 +2069,13 @@
- #define TG3_FLAG_JUMBO_ENABLE		0x00800000
- #define TG3_FLAG_10_100_ONLY		0x01000000
- #define TG3_FLAG_PAUSE_AUTONEG		0x02000000
--#define TG3_FLAG_PAUSE_RX		0x04000000
--#define TG3_FLAG_PAUSE_TX		0x08000000
- #define TG3_FLAG_BROKEN_CHECKSUMS	0x10000000
- #define TG3_FLAG_GOT_SERDES_FLOWCTL	0x20000000
- #define TG3_FLAG_SPLIT_MODE		0x40000000
- #define TG3_FLAG_INIT_COMPLETE		0x80000000
- 	u32				tg3_flags2;
- #define TG3_FLG2_RESTART_TIMER		0x00000001
--#define TG3_FLG2_SUN_5704		0x00000002
-+#define TG3_FLG2_SUN_570X		0x00000002
- #define TG3_FLG2_NO_ETH_WIRE_SPEED	0x00000004
- #define TG3_FLG2_IS_5788		0x00000008
- #define TG3_FLG2_MAX_RXPEND_64		0x00000010
-@@ -2089,6 +2086,9 @@
- #define TG3_FLG2_PCI_EXPRESS		0x00000200
- #define TG3_FLG2_ASF_NEW_HANDSHAKE	0x00000400
- #define TG3_FLG2_HW_AUTONEG		0x00000800
-+#define TG3_FLG2_PHY_JUST_INITTED	0x00001000
-+#define TG3_FLG2_PHY_SERDES		0x00002000
-+#define TG3_FLG2_CAPACITIVE_COUPLING	0x00004000
- 
- 	u32				split_mode_max_reqs;
- #define SPLIT_MODE_5704_MAX_REQ		3
-@@ -2136,7 +2136,6 @@
- #define PHY_ID_BCM5705			0x600081a0
- #define PHY_ID_BCM5750			0x60008180
- #define PHY_ID_BCM8002			0x60010140
--#define PHY_ID_SERDES			0xfeedbee0
- #define PHY_ID_INVALID			0xffffffff
- #define PHY_ID_REV_MASK			0x0000000f
- #define PHY_REV_BCM5401_B0		0x1
-@@ -2159,7 +2158,7 @@
- 	 (X) == PHY_ID_BCM5411 || (X) == PHY_ID_BCM5701 || \
- 	 (X) == PHY_ID_BCM5703 || (X) == PHY_ID_BCM5704 || \
- 	 (X) == PHY_ID_BCM5705 || (X) == PHY_ID_BCM5750 || \
--	 (X) == PHY_ID_BCM8002 || (X) == PHY_ID_SERDES)
-+	 (X) == PHY_ID_BCM8002)
- 
- 	struct tg3_hw_stats		*hw_stats;
- 	dma_addr_t			stats_mapping;