ewrk3/tulip: Move the DEC - Tulip drivers

Move the DEC - Tulip driver into drivers/net/ethernet/dec/tulip/
and make the necessary Kconfig and Makefile changes.

The Digital Equioment (DEC) driver ewrk3 was moved into
drivers/net/ethernet/dec/ and the remaining drivers (Tulip)
were moved into drivers/net/ethernet/dec/tulip/

CC: Tobias Ringstrom <tori@unhappy.mine.nu>
CC: Grant Grundler <grundler@parisc-linux.org>
CC: David Davies <davies@maniac.ultranet.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Acked-by: Grant Grundler <grundler@parisc-linux.org>

1 files changed, 0 insertions, 2215 deletions

diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
deleted file mode 100644
index ce90efc6ba3..00000000000
--- a/drivers/net/tulip/de2104x.c
+++ /dev/null
@@ -1,2215 +0,0 @@
-/* de2104x.c: A Linux PCI Ethernet driver for Intel/Digital 21040/1 chips. */
-/*
-	Copyright 2001,2003 Jeff Garzik <jgarzik@pobox.com>
-
-	Copyright 1994, 1995 Digital Equipment Corporation.	    [de4x5.c]
-	Written/copyright 1994-2001 by Donald Becker.		    [tulip.c]
-
-	This software may be used and distributed according to the terms of
-	the GNU General Public License (GPL), incorporated herein by reference.
-	Drivers based on or derived from this code fall under the GPL and must
-	retain the authorship, copyright and license notice.  This file is not
-	a complete program and may only be used when the entire operating
-	system is licensed under the GPL.
-
-	See the file COPYING in this distribution for more information.
-
-	TODO, in rough priority order:
-	* Support forcing media type with a module parameter,
-	  like dl2k.c/sundance.c
-	* Constants (module parms?) for Rx work limit
-	* Complete reset on PciErr
-	* Jumbo frames / dev->change_mtu
-	* Adjust Rx FIFO threshold and Max Rx DMA burst on Rx FIFO error
-	* Adjust Tx FIFO threshold and Max Tx DMA burst on Tx FIFO error
-	* Implement Tx software interrupt mitigation via
-	  Tx descriptor bit
-
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#define DRV_NAME		"de2104x"
-#define DRV_VERSION		"0.7"
-#define DRV_RELDATE		"Mar 17, 2004"
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/pci.h>
-#include <linux/delay.h>
-#include <linux/ethtool.h>
-#include <linux/compiler.h>
-#include <linux/rtnetlink.h>
-#include <linux/crc32.h>
-#include <linux/slab.h>
-
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/uaccess.h>
-#include <asm/unaligned.h>
-
-/* These identify the driver base version and may not be removed. */
-static char version[] =
-"PCI Ethernet driver v" DRV_VERSION " (" DRV_RELDATE ")";
-
-MODULE_AUTHOR("Jeff Garzik <jgarzik@pobox.com>");
-MODULE_DESCRIPTION("Intel/Digital 21040/1 series PCI Ethernet driver");
-MODULE_LICENSE("GPL");
-MODULE_VERSION(DRV_VERSION);
-
-static int debug = -1;
-module_param (debug, int, 0);
-MODULE_PARM_DESC (debug, "de2104x bitmapped message enable number");
-
-/* Set the copy breakpoint for the copy-only-tiny-buffer Rx structure. */
-#if defined(__alpha__) || defined(__arm__) || defined(__hppa__) || \
-        defined(CONFIG_SPARC) || defined(__ia64__) ||		   \
-        defined(__sh__) || defined(__mips__)
-static int rx_copybreak = 1518;
-#else
-static int rx_copybreak = 100;
-#endif
-module_param (rx_copybreak, int, 0);
-MODULE_PARM_DESC (rx_copybreak, "de2104x Breakpoint at which Rx packets are copied");
-
-#define DE_DEF_MSG_ENABLE	(NETIF_MSG_DRV		| \
-				 NETIF_MSG_PROBE 	| \
-				 NETIF_MSG_LINK		| \
-				 NETIF_MSG_IFDOWN	| \
-				 NETIF_MSG_IFUP		| \
-				 NETIF_MSG_RX_ERR	| \
-				 NETIF_MSG_TX_ERR)
-
-/* Descriptor skip length in 32 bit longwords. */
-#ifndef CONFIG_DE2104X_DSL
-#define DSL			0
-#else
-#define DSL			CONFIG_DE2104X_DSL
-#endif
-
-#define DE_RX_RING_SIZE		64
-#define DE_TX_RING_SIZE		64
-#define DE_RING_BYTES		\
-		((sizeof(struct de_desc) * DE_RX_RING_SIZE) +	\
-		(sizeof(struct de_desc) * DE_TX_RING_SIZE))
-#define NEXT_TX(N)		(((N) + 1) & (DE_TX_RING_SIZE - 1))
-#define NEXT_RX(N)		(((N) + 1) & (DE_RX_RING_SIZE - 1))
-#define TX_BUFFS_AVAIL(CP)					\
-	(((CP)->tx_tail <= (CP)->tx_head) ?			\
-	  (CP)->tx_tail + (DE_TX_RING_SIZE - 1) - (CP)->tx_head :	\
-	  (CP)->tx_tail - (CP)->tx_head - 1)
-
-#define PKT_BUF_SZ		1536	/* Size of each temporary Rx buffer.*/
-#define RX_OFFSET		2
-
-#define DE_SETUP_SKB		((struct sk_buff *) 1)
-#define DE_DUMMY_SKB		((struct sk_buff *) 2)
-#define DE_SETUP_FRAME_WORDS	96
-#define DE_EEPROM_WORDS		256
-#define DE_EEPROM_SIZE		(DE_EEPROM_WORDS * sizeof(u16))
-#define DE_MAX_MEDIA		5
-
-#define DE_MEDIA_TP_AUTO	0
-#define DE_MEDIA_BNC		1
-#define DE_MEDIA_AUI		2
-#define DE_MEDIA_TP		3
-#define DE_MEDIA_TP_FD		4
-#define DE_MEDIA_INVALID	DE_MAX_MEDIA
-#define DE_MEDIA_FIRST		0
-#define DE_MEDIA_LAST		(DE_MAX_MEDIA - 1)
-#define DE_AUI_BNC		(SUPPORTED_AUI | SUPPORTED_BNC)
-
-#define DE_TIMER_LINK		(60 * HZ)
-#define DE_TIMER_NO_LINK	(5 * HZ)
-
-#define DE_NUM_REGS		16
-#define DE_REGS_SIZE		(DE_NUM_REGS * sizeof(u32))
-#define DE_REGS_VER		1
-
-/* Time in jiffies before concluding the transmitter is hung. */
-#define TX_TIMEOUT		(6*HZ)
-
-/* This is a mysterious value that can be written to CSR11 in the 21040 (only)
-   to support a pre-NWay full-duplex signaling mechanism using short frames.
-   No one knows what it should be, but if left at its default value some
-   10base2(!) packets trigger a full-duplex-request interrupt. */
-#define FULL_DUPLEX_MAGIC	0x6969
-
-enum {
-	/* NIC registers */
-	BusMode			= 0x00,
-	TxPoll			= 0x08,
-	RxPoll			= 0x10,
-	RxRingAddr		= 0x18,
-	TxRingAddr		= 0x20,
-	MacStatus		= 0x28,
-	MacMode			= 0x30,
-	IntrMask		= 0x38,
-	RxMissed		= 0x40,
-	ROMCmd			= 0x48,
-	CSR11			= 0x58,
-	SIAStatus		= 0x60,
-	CSR13			= 0x68,
-	CSR14			= 0x70,
-	CSR15			= 0x78,
-	PCIPM			= 0x40,
-
-	/* BusMode bits */
-	CmdReset		= (1 << 0),
-	CacheAlign16		= 0x00008000,
-	BurstLen4		= 0x00000400,
-	DescSkipLen		= (DSL << 2),
-
-	/* Rx/TxPoll bits */
-	NormalTxPoll		= (1 << 0),
-	NormalRxPoll		= (1 << 0),
-
-	/* Tx/Rx descriptor status bits */
-	DescOwn			= (1 << 31),
-	RxError			= (1 << 15),
-	RxErrLong		= (1 << 7),
-	RxErrCRC		= (1 << 1),
-	RxErrFIFO		= (1 << 0),
-	RxErrRunt		= (1 << 11),
-	RxErrFrame		= (1 << 14),
-	RingEnd			= (1 << 25),
-	FirstFrag		= (1 << 29),
-	LastFrag		= (1 << 30),
-	TxError			= (1 << 15),
-	TxFIFOUnder		= (1 << 1),
-	TxLinkFail		= (1 << 2) | (1 << 10) | (1 << 11),
-	TxMaxCol		= (1 << 8),
-	TxOWC			= (1 << 9),
-	TxJabber		= (1 << 14),
-	SetupFrame		= (1 << 27),
-	TxSwInt			= (1 << 31),
-
-	/* MacStatus bits */
-	IntrOK			= (1 << 16),
-	IntrErr			= (1 << 15),
-	RxIntr			= (1 << 6),
-	RxEmpty			= (1 << 7),
-	TxIntr			= (1 << 0),
-	TxEmpty			= (1 << 2),
-	PciErr			= (1 << 13),
-	TxState			= (1 << 22) | (1 << 21) | (1 << 20),
-	RxState			= (1 << 19) | (1 << 18) | (1 << 17),
-	LinkFail		= (1 << 12),
-	LinkPass		= (1 << 4),
-	RxStopped		= (1 << 8),
-	TxStopped		= (1 << 1),
-
-	/* MacMode bits */
-	TxEnable		= (1 << 13),
-	RxEnable		= (1 << 1),
-	RxTx			= TxEnable | RxEnable,
-	FullDuplex		= (1 << 9),
-	AcceptAllMulticast	= (1 << 7),
-	AcceptAllPhys		= (1 << 6),
-	BOCnt			= (1 << 5),
-	MacModeClear		= (1<<12) | (1<<11) | (1<<10) | (1<<8) | (1<<3) |
-				  RxTx | BOCnt | AcceptAllPhys | AcceptAllMulticast,
-
-	/* ROMCmd bits */
-	EE_SHIFT_CLK		= 0x02,	/* EEPROM shift clock. */
-	EE_CS			= 0x01,	/* EEPROM chip select. */
-	EE_DATA_WRITE		= 0x04,	/* Data from the Tulip to EEPROM. */
-	EE_WRITE_0		= 0x01,
-	EE_WRITE_1		= 0x05,
-	EE_DATA_READ		= 0x08,	/* Data from the EEPROM chip. */
-	EE_ENB			= (0x4800 | EE_CS),
-
-	/* The EEPROM commands include the alway-set leading bit. */
-	EE_READ_CMD		= 6,
-
-	/* RxMissed bits */
-	RxMissedOver		= (1 << 16),
-	RxMissedMask		= 0xffff,
-
-	/* SROM-related bits */
-	SROMC0InfoLeaf		= 27,
-	MediaBlockMask		= 0x3f,
-	MediaCustomCSRs		= (1 << 6),
-
-	/* PCIPM bits */
-	PM_Sleep		= (1 << 31),
-	PM_Snooze		= (1 << 30),
-	PM_Mask			= PM_Sleep | PM_Snooze,
-
-	/* SIAStatus bits */
-	NWayState		= (1 << 14) | (1 << 13) | (1 << 12),
-	NWayRestart		= (1 << 12),
-	NonselPortActive	= (1 << 9),
-	SelPortActive		= (1 << 8),
-	LinkFailStatus		= (1 << 2),
-	NetCxnErr		= (1 << 1),
-};
-
-static const u32 de_intr_mask =
-	IntrOK | IntrErr | RxIntr | RxEmpty | TxIntr | TxEmpty |
-	LinkPass | LinkFail | PciErr;
-
-/*
- * Set the programmable burst length to 4 longwords for all:
- * DMA errors result without these values. Cache align 16 long.
- */
-static const u32 de_bus_mode = CacheAlign16 | BurstLen4 | DescSkipLen;
-
-struct de_srom_media_block {
-	u8			opts;
-	u16			csr13;
-	u16			csr14;
-	u16			csr15;
-} __packed;
-
-struct de_srom_info_leaf {
-	u16			default_media;
-	u8			n_blocks;
-	u8			unused;
-} __packed;
-
-struct de_desc {
-	__le32			opts1;
-	__le32			opts2;
-	__le32			addr1;
-	__le32			addr2;
-#if DSL
-	__le32			skip[DSL];
-#endif
-};
-
-struct media_info {
-	u16			type;	/* DE_MEDIA_xxx */
-	u16			csr13;
-	u16			csr14;
-	u16			csr15;
-};
-
-struct ring_info {
-	struct sk_buff		*skb;
-	dma_addr_t		mapping;
-};
-
-struct de_private {
-	unsigned		tx_head;
-	unsigned		tx_tail;
-	unsigned		rx_tail;
-
-	void			__iomem *regs;
-	struct net_device	*dev;
-	spinlock_t		lock;
-
-	struct de_desc		*rx_ring;
-	struct de_desc		*tx_ring;
-	struct ring_info	tx_skb[DE_TX_RING_SIZE];
-	struct ring_info	rx_skb[DE_RX_RING_SIZE];
-	unsigned		rx_buf_sz;
-	dma_addr_t		ring_dma;
-
-	u32			msg_enable;
-
-	struct net_device_stats net_stats;
-
-	struct pci_dev		*pdev;
-
-	u16			setup_frame[DE_SETUP_FRAME_WORDS];
-
-	u32			media_type;
-	u32			media_supported;
-	u32			media_advertise;
-	struct media_info	media[DE_MAX_MEDIA];
-	struct timer_list	media_timer;
-
-	u8			*ee_data;
-	unsigned		board_idx;
-	unsigned		de21040 : 1;
-	unsigned		media_lock : 1;
-};
-
-
-static void de_set_rx_mode (struct net_device *dev);
-static void de_tx (struct de_private *de);
-static void de_clean_rings (struct de_private *de);
-static void de_media_interrupt (struct de_private *de, u32 status);
-static void de21040_media_timer (unsigned long data);
-static void de21041_media_timer (unsigned long data);
-static unsigned int de_ok_to_advertise (struct de_private *de, u32 new_media);
-
-
-static DEFINE_PCI_DEVICE_TABLE(de_pci_tbl) = {
-	{ PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP,
-	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-	{ PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP_PLUS,
-	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 },
-	{ },
-};
-MODULE_DEVICE_TABLE(pci, de_pci_tbl);
-
-static const char * const media_name[DE_MAX_MEDIA] = {
-	"10baseT auto",
-	"BNC",
-	"AUI",
-	"10baseT-HD",
-	"10baseT-FD"
-};
-
-/* 21040 transceiver register settings:
- * TP AUTO(unused), BNC(unused), AUI, TP, TP FD*/
-static u16 t21040_csr13[] = { 0, 0, 0x8F09, 0x8F01, 0x8F01, };
-static u16 t21040_csr14[] = { 0, 0, 0x0705, 0xFFFF, 0xFFFD, };
-static u16 t21040_csr15[] = { 0, 0, 0x0006, 0x0000, 0x0000, };
-
-/* 21041 transceiver register settings: TP AUTO, BNC, AUI, TP, TP FD*/
-static u16 t21041_csr13[] = { 0xEF01, 0xEF09, 0xEF09, 0xEF01, 0xEF09, };
-static u16 t21041_csr14[] = { 0xFFFF, 0xF7FD, 0xF7FD, 0x7F3F, 0x7F3D, };
-/* If on-chip autonegotiation is broken, use half-duplex (FF3F) instead */
-static u16 t21041_csr14_brk[] = { 0xFF3F, 0xF7FD, 0xF7FD, 0x7F3F, 0x7F3D, };
-static u16 t21041_csr15[] = { 0x0008, 0x0006, 0x000E, 0x0008, 0x0008, };
-
-
-#define dr32(reg)	ioread32(de->regs + (reg))
-#define dw32(reg, val)	iowrite32((val), de->regs + (reg))
-
-
-static void de_rx_err_acct (struct de_private *de, unsigned rx_tail,
-			    u32 status, u32 len)
-{
-	netif_dbg(de, rx_err, de->dev,
-		  "rx err, slot %d status 0x%x len %d\n",
-		  rx_tail, status, len);
-
-	if ((status & 0x38000300) != 0x0300) {
-		/* Ingore earlier buffers. */
-		if ((status & 0xffff) != 0x7fff) {
-			netif_warn(de, rx_err, de->dev,
-				   "Oversized Ethernet frame spanned multiple buffers, status %08x!\n",
-				   status);
-			de->net_stats.rx_length_errors++;
-		}
-	} else if (status & RxError) {
-		/* There was a fatal error. */
-		de->net_stats.rx_errors++; /* end of a packet.*/
-		if (status & 0x0890) de->net_stats.rx_length_errors++;
-		if (status & RxErrCRC) de->net_stats.rx_crc_errors++;
-		if (status & RxErrFIFO) de->net_stats.rx_fifo_errors++;
-	}
-}
-
-static void de_rx (struct de_private *de)
-{
-	unsigned rx_tail = de->rx_tail;
-	unsigned rx_work = DE_RX_RING_SIZE;
-	unsigned drop = 0;
-	int rc;
-
-	while (--rx_work) {
-		u32 status, len;
-		dma_addr_t mapping;
-		struct sk_buff *skb, *copy_skb;
-		unsigned copying_skb, buflen;
-
-		skb = de->rx_skb[rx_tail].skb;
-		BUG_ON(!skb);
-		rmb();
-		status = le32_to_cpu(de->rx_ring[rx_tail].opts1);
-		if (status & DescOwn)
-			break;
-
-		len = ((status >> 16) & 0x7ff) - 4;
-		mapping = de->rx_skb[rx_tail].mapping;
-
-		if (unlikely(drop)) {
-			de->net_stats.rx_dropped++;
-			goto rx_next;
-		}
-
-		if (unlikely((status & 0x38008300) != 0x0300)) {
-			de_rx_err_acct(de, rx_tail, status, len);
-			goto rx_next;
-		}
-
-		copying_skb = (len <= rx_copybreak);
-
-		netif_dbg(de, rx_status, de->dev,
-			  "rx slot %d status 0x%x len %d copying? %d\n",
-			  rx_tail, status, len, copying_skb);
-
-		buflen = copying_skb ? (len + RX_OFFSET) : de->rx_buf_sz;
-		copy_skb = dev_alloc_skb (buflen);
-		if (unlikely(!copy_skb)) {
-			de->net_stats.rx_dropped++;
-			drop = 1;
-			rx_work = 100;
-			goto rx_next;
-		}
-
-		if (!copying_skb) {
-			pci_unmap_single(de->pdev, mapping,
-					 buflen, PCI_DMA_FROMDEVICE);
-			skb_put(skb, len);
-
-			mapping =
-			de->rx_skb[rx_tail].mapping =
-				pci_map_single(de->pdev, copy_skb->data,
-					       buflen, PCI_DMA_FROMDEVICE);
-			de->rx_skb[rx_tail].skb = copy_skb;
-		} else {
-			pci_dma_sync_single_for_cpu(de->pdev, mapping, len, PCI_DMA_FROMDEVICE);
-			skb_reserve(copy_skb, RX_OFFSET);
-			skb_copy_from_linear_data(skb, skb_put(copy_skb, len),
-						  len);
-			pci_dma_sync_single_for_device(de->pdev, mapping, len, PCI_DMA_FROMDEVICE);
-
-			/* We'll reuse the original ring buffer. */
-			skb = copy_skb;
-		}
-
-		skb->protocol = eth_type_trans (skb, de->dev);
-
-		de->net_stats.rx_packets++;
-		de->net_stats.rx_bytes += skb->len;
-		rc = netif_rx (skb);
-		if (rc == NET_RX_DROP)
-			drop = 1;
-
-rx_next:
-		if (rx_tail == (DE_RX_RING_SIZE - 1))
-			de->rx_ring[rx_tail].opts2 =
-				cpu_to_le32(RingEnd | de->rx_buf_sz);
-		else
-			de->rx_ring[rx_tail].opts2 = cpu_to_le32(de->rx_buf_sz);
-		de->rx_ring[rx_tail].addr1 = cpu_to_le32(mapping);
-		wmb();
-		de->rx_ring[rx_tail].opts1 = cpu_to_le32(DescOwn);
-		rx_tail = NEXT_RX(rx_tail);
-	}
-
-	if (!rx_work)
-		netdev_warn(de->dev, "rx work limit reached\n");
-
-	de->rx_tail = rx_tail;
-}
-
-static irqreturn_t de_interrupt (int irq, void *dev_instance)
-{
-	struct net_device *dev = dev_instance;
-	struct de_private *de = netdev_priv(dev);
-	u32 status;
-
-	status = dr32(MacStatus);
-	if ((!(status & (IntrOK|IntrErr))) || (status == 0xFFFF))
-		return IRQ_NONE;
-
-	netif_dbg(de, intr, dev, "intr, status %08x mode %08x desc %u/%u/%u\n",
-		  status, dr32(MacMode),
-		  de->rx_tail, de->tx_head, de->tx_tail);
-
-	dw32(MacStatus, status);
-
-	if (status & (RxIntr | RxEmpty)) {
-		de_rx(de);
-		if (status & RxEmpty)
-			dw32(RxPoll, NormalRxPoll);
-	}
-
-	spin_lock(&de->lock);
-
-	if (status & (TxIntr | TxEmpty))
-		de_tx(de);
-
-	if (status & (LinkPass | LinkFail))
-		de_media_interrupt(de, status);
-
-	spin_unlock(&de->lock);
-
-	if (status & PciErr) {
-		u16 pci_status;
-
-		pci_read_config_word(de->pdev, PCI_STATUS, &pci_status);
-		pci_write_config_word(de->pdev, PCI_STATUS, pci_status);
-		netdev_err(de->dev,
-			   "PCI bus error, status=%08x, PCI status=%04x\n",
-			   status, pci_status);
-	}
-
-	return IRQ_HANDLED;
-}
-
-static void de_tx (struct de_private *de)
-{
-	unsigned tx_head = de->tx_head;
-	unsigned tx_tail = de->tx_tail;
-
-	while (tx_tail != tx_head) {
-		struct sk_buff *skb;
-		u32 status;
-
-		rmb();
-		status = le32_to_cpu(de->tx_ring[tx_tail].opts1);
-		if (status & DescOwn)
-			break;
-
-		skb = de->tx_skb[tx_tail].skb;
-		BUG_ON(!skb);
-		if (unlikely(skb == DE_DUMMY_SKB))
-			goto next;
-
-		if (unlikely(skb == DE_SETUP_SKB)) {
-			pci_unmap_single(de->pdev, de->tx_skb[tx_tail].mapping,
-					 sizeof(de->setup_frame), PCI_DMA_TODEVICE);
-			goto next;
-		}
-
-		pci_unmap_single(de->pdev, de->tx_skb[tx_tail].mapping,
-				 skb->len, PCI_DMA_TODEVICE);
-
-		if (status & LastFrag) {
-			if (status & TxError) {
-				netif_dbg(de, tx_err, de->dev,
-					  "tx err, status 0x%x\n",
-					  status);
-				de->net_stats.tx_errors++;
-				if (status & TxOWC)
-					de->net_stats.tx_window_errors++;
-				if (status & TxMaxCol)
-					de->net_stats.tx_aborted_errors++;
-				if (status & TxLinkFail)
-					de->net_stats.tx_carrier_errors++;
-				if (status & TxFIFOUnder)
-					de->net_stats.tx_fifo_errors++;
-			} else {
-				de->net_stats.tx_packets++;
-				de->net_stats.tx_bytes += skb->len;
-				netif_dbg(de, tx_done, de->dev,
-					  "tx done, slot %d\n", tx_tail);
-			}
-			dev_kfree_skb_irq(skb);
-		}
-
-next:
-		de->tx_skb[tx_tail].skb = NULL;
-
-		tx_tail = NEXT_TX(tx_tail);
-	}
-
-	de->tx_tail = tx_tail;
-
-	if (netif_queue_stopped(de->dev) && (TX_BUFFS_AVAIL(de) > (DE_TX_RING_SIZE / 4)))
-		netif_wake_queue(de->dev);
-}
-
-static netdev_tx_t de_start_xmit (struct sk_buff *skb,
-					struct net_device *dev)
-{
-	struct de_private *de = netdev_priv(dev);
-	unsigned int entry, tx_free;
-	u32 mapping, len, flags = FirstFrag | LastFrag;
-	struct de_desc *txd;
-
-	spin_lock_irq(&de->lock);
-
-	tx_free = TX_BUFFS_AVAIL(de);
-	if (tx_free == 0) {
-		netif_stop_queue(dev);
-		spin_unlock_irq(&de->lock);
-		return NETDEV_TX_BUSY;
-	}
-	tx_free--;
-
-	entry = de->tx_head;
-
-	txd = &de->tx_ring[entry];
-
-	len = skb->len;
-	mapping = pci_map_single(de->pdev, skb->data, len, PCI_DMA_TODEVICE);
-	if (entry == (DE_TX_RING_SIZE - 1))
-		flags |= RingEnd;
-	if (!tx_free || (tx_free == (DE_TX_RING_SIZE / 2)))
-		flags |= TxSwInt;
-	flags |= len;
-	txd->opts2 = cpu_to_le32(flags);
-	txd->addr1 = cpu_to_le32(mapping);
-
-	de->tx_skb[entry].skb = skb;
-	de->tx_skb[entry].mapping = mapping;
-	wmb();
-
-	txd->opts1 = cpu_to_le32(DescOwn);
-	wmb();
-
-	de->tx_head = NEXT_TX(entry);
-	netif_dbg(de, tx_queued, dev, "tx queued, slot %d, skblen %d\n",
-		  entry, skb->len);
-
-	if (tx_free == 0)
-		netif_stop_queue(dev);
-
-	spin_unlock_irq(&de->lock);
-
-	/* Trigger an immediate transmit demand. */
-	dw32(TxPoll, NormalTxPoll);
-
-	return NETDEV_TX_OK;
-}
-
-/* Set or clear the multicast filter for this adaptor.
-   Note that we only use exclusion around actually queueing the
-   new frame, not around filling de->setup_frame.  This is non-deterministic
-   when re-entered but still correct. */
-
-#undef set_bit_le
-#define set_bit_le(i,p) do { ((char *)(p))[(i)/8] |= (1<<((i)%8)); } while(0)
-
-static void build_setup_frame_hash(u16 *setup_frm, struct net_device *dev)
-{
-	struct de_private *de = netdev_priv(dev);
-	u16 hash_table[32];
-	struct netdev_hw_addr *ha;
-	int i;
-	u16 *eaddrs;
-
-	memset(hash_table, 0, sizeof(hash_table));
-	set_bit_le(255, hash_table); 			/* Broadcast entry */
-	/* This should work on big-endian machines as well. */
-	netdev_for_each_mc_addr(ha, dev) {
-		int index = ether_crc_le(ETH_ALEN, ha->addr) & 0x1ff;
-
-		set_bit_le(index, hash_table);
-	}
-
-	for (i = 0; i < 32; i++) {
-		*setup_frm++ = hash_table[i];
-		*setup_frm++ = hash_table[i];
-	}
-	setup_frm = &de->setup_frame[13*6];
-
-	/* Fill the final entry with our physical address. */
-	eaddrs = (u16 *)dev->dev_addr;
-	*setup_frm++ = eaddrs[0]; *setup_frm++ = eaddrs[0];
-	*setup_frm++ = eaddrs[1]; *setup_frm++ = eaddrs[1];
-	*setup_frm++ = eaddrs[2]; *setup_frm++ = eaddrs[2];
-}
-
-static void build_setup_frame_perfect(u16 *setup_frm, struct net_device *dev)
-{
-	struct de_private *de = netdev_priv(dev);
-	struct netdev_hw_addr *ha;
-	u16 *eaddrs;
-
-	/* We have <= 14 addresses so we can use the wonderful
-	   16 address perfect filtering of the Tulip. */
-	netdev_for_each_mc_addr(ha, dev) {
-		eaddrs = (u16 *) ha->addr;
-		*setup_frm++ = *eaddrs; *setup_frm++ = *eaddrs++;
-		*setup_frm++ = *eaddrs; *setup_frm++ = *eaddrs++;
-		*setup_frm++ = *eaddrs; *setup_frm++ = *eaddrs++;
-	}
-	/* Fill the unused entries with the broadcast address. */
-	memset(setup_frm, 0xff, (15 - netdev_mc_count(dev)) * 12);
-	setup_frm = &de->setup_frame[15*6];
-
-	/* Fill the final entry with our physical address. */
-	eaddrs = (u16 *)dev->dev_addr;
-	*setup_frm++ = eaddrs[0]; *setup_frm++ = eaddrs[0];
-	*setup_frm++ = eaddrs[1]; *setup_frm++ = eaddrs[1];
-	*setup_frm++ = eaddrs[2]; *setup_frm++ = eaddrs[2];
-}
-
-
-static void __de_set_rx_mode (struct net_device *dev)
-{
-	struct de_private *de = netdev_priv(dev);
-	u32 macmode;
-	unsigned int entry;
-	u32 mapping;
-	struct de_desc *txd;
-	struct de_desc *dummy_txd = NULL;
-
-	macmode = dr32(MacMode) & ~(AcceptAllMulticast | AcceptAllPhys);
-
-	if (dev->flags & IFF_PROMISC) {	/* Set promiscuous. */
-		macmode |= AcceptAllMulticast | AcceptAllPhys;
-		goto out;
-	}
-
-	if ((netdev_mc_count(dev) > 1000) || (dev->flags & IFF_ALLMULTI)) {
-		/* Too many to filter well -- accept all multicasts. */
-		macmode |= AcceptAllMulticast;
-		goto out;
-	}
-
-	/* Note that only the low-address shortword of setup_frame is valid!
-	   The values are doubled for big-endian architectures. */
-	if (netdev_mc_count(dev) > 14)	/* Must use a multicast hash table. */
-		build_setup_frame_hash (de->setup_frame, dev);
-	else
-		build_setup_frame_perfect (de->setup_frame, dev);
-
-	/*
-	 * Now add this frame to the Tx list.
-	 */
-
-	entry = de->tx_head;
-
-	/* Avoid a chip errata by prefixing a dummy entry. */
-	if (entry != 0) {
-		de->tx_skb[entry].skb = DE_DUMMY_SKB;
-
-		dummy_txd = &de->tx_ring[entry];
-		dummy_txd->opts2 = (entry == (DE_TX_RING_SIZE - 1)) ?
-				   cpu_to_le32(RingEnd) : 0;
-		dummy_txd->addr1 = 0;
-
-		/* Must set DescOwned later to avoid race with chip */
-
-		entry = NEXT_TX(entry);
-	}
-
-	de->tx_skb[entry].skb = DE_SETUP_SKB;
-	de->tx_skb[entry].mapping = mapping =
-	    pci_map_single (de->pdev, de->setup_frame,
-			    sizeof (de->setup_frame), PCI_DMA_TODEVICE);
-
-	/* Put the setup frame on the Tx list. */
-	txd = &de->tx_ring[entry];
-	if (entry == (DE_TX_RING_SIZE - 1))
-		txd->opts2 = cpu_to_le32(SetupFrame | RingEnd | sizeof (de->setup_frame));
-	else
-		txd->opts2 = cpu_to_le32(SetupFrame | sizeof (de->setup_frame));
-	txd->addr1 = cpu_to_le32(mapping);
-	wmb();
-
-	txd->opts1 = cpu_to_le32(DescOwn);
-	wmb();
-
-	if (dummy_txd) {
-		dummy_txd->opts1 = cpu_to_le32(DescOwn);
-		wmb();
-	}
-
-	de->tx_head = NEXT_TX(entry);
-
-	if (TX_BUFFS_AVAIL(de) == 0)
-		netif_stop_queue(dev);
-
-	/* Trigger an immediate transmit demand. */
-	dw32(TxPoll, NormalTxPoll);
-
-out:
-	if (macmode != dr32(MacMode))
-		dw32(MacMode, macmode);
-}
-
-static void de_set_rx_mode (struct net_device *dev)
-{
-	unsigned long flags;
-	struct de_private *de = netdev_priv(dev);
-
-	spin_lock_irqsave (&de->lock, flags);
-	__de_set_rx_mode(dev);
-	spin_unlock_irqrestore (&de->lock, flags);
-}
-
-static inline void de_rx_missed(struct de_private *de, u32 rx_missed)
-{
-	if (unlikely(rx_missed & RxMissedOver))
-		de->net_stats.rx_missed_errors += RxMissedMask;
-	else
-		de->net_stats.rx_missed_errors += (rx_missed & RxMissedMask);
-}
-
-static void __de_get_stats(struct de_private *de)
-{
-	u32 tmp = dr32(RxMissed); /* self-clearing */
-
-	de_rx_missed(de, tmp);
-}
-
-static struct net_device_stats *de_get_stats(struct net_device *dev)
-{
-	struct de_private *de = netdev_priv(dev);
-
-	/* The chip only need report frame silently dropped. */
-	spin_lock_irq(&de->lock);
- 	if (netif_running(dev) && netif_device_present(dev))
- 		__de_get_stats(de);
-	spin_unlock_irq(&de->lock);
-
-	return &de->net_stats;
-}
-
-static inline int de_is_running (struct de_private *de)
-{
-	return (dr32(MacStatus) & (RxState | TxState)) ? 1 : 0;
-}
-
-static void de_stop_rxtx (struct de_private *de)
-{
-	u32 macmode;
-	unsigned int i = 1300/100;
-
-	macmode = dr32(MacMode);
-	if (macmode & RxTx) {
-		dw32(MacMode, macmode & ~RxTx);
-		dr32(MacMode);
-	}
-
-	/* wait until in-flight frame completes.
-	 * Max time @ 10BT: 1500*8b/10Mbps == 1200us (+ 100us margin)
-	 * Typically expect this loop to end in < 50 us on 100BT.
-	 */
-	while (--i) {
-		if (!de_is_running(de))
-			return;
-		udelay(100);
-	}
-
-	netdev_warn(de->dev, "timeout expired, stopping DMA\n");
-}
-
-static inline void de_start_rxtx (struct de_private *de)
-{
-	u32 macmode;
-
-	macmode = dr32(MacMode);
-	if ((macmode & RxTx) != RxTx) {
-		dw32(MacMode, macmode | RxTx);
-		dr32(MacMode);
-	}
-}
-
-static void de_stop_hw (struct de_private *de)
-{
-
-	udelay(5);
-	dw32(IntrMask, 0);
-
-	de_stop_rxtx(de);
-
-	dw32(MacStatus, dr32(MacStatus));
-
-	udelay(10);
-
-	de->rx_tail = 0;
-	de->tx_head = de->tx_tail = 0;
-}
-
-static void de_link_up(struct de_private *de)
-{
-	if (!netif_carrier_ok(de->dev)) {
-		netif_carrier_on(de->dev);
-		netif_info(de, link, de->dev, "link up, media %s\n",
-			   media_name[de->media_type]);
-	}
-}
-
-static void de_link_down(struct de_private *de)
-{
-	if (netif_carrier_ok(de->dev)) {
-		netif_carrier_off(de->dev);
-		netif_info(de, link, de->dev, "link down\n");
-	}
-}
-
-static void de_set_media (struct de_private *de)
-{
-	unsigned media = de->media_type;
-	u32 macmode = dr32(MacMode);
-
-	if (de_is_running(de))
-		netdev_warn(de->dev, "chip is running while changing media!\n");
-
-	if (de->de21040)
-		dw32(CSR11, FULL_DUPLEX_MAGIC);
-	dw32(CSR13, 0); /* Reset phy */
-	dw32(CSR14, de->media[media].csr14);
-	dw32(CSR15, de->media[media].csr15);
-	dw32(CSR13, de->media[media].csr13);
-
-	/* must delay 10ms before writing to other registers,
-	 * especially CSR6
-	 */
-	mdelay(10);
-
-	if (media == DE_MEDIA_TP_FD)
-		macmode |= FullDuplex;
-	else
-		macmode &= ~FullDuplex;
-
-	netif_info(de, link, de->dev, "set link %s\n", media_name[media]);
-	netif_info(de, hw, de->dev, "mode 0x%x, sia 0x%x,0x%x,0x%x,0x%x\n",
-		   dr32(MacMode), dr32(SIAStatus),
-		   dr32(CSR13), dr32(CSR14), dr32(CSR15));
-	netif_info(de, hw, de->dev, "set mode 0x%x, set sia 0x%x,0x%x,0x%x\n",
-		   macmode, de->media[media].csr13,
-		   de->media[media].csr14, de->media[media].csr15);
-	if (macmode != dr32(MacMode))
-		dw32(MacMode, macmode);
-}
-
-static void de_next_media (struct de_private *de, const u32 *media,
-			   unsigned int n_media)
-{
-	unsigned int i;
-
-	for (i = 0; i < n_media; i++) {
-		if (de_ok_to_advertise(de, media[i])) {
-			de->media_type = media[i];
-			return;
-		}
-	}
-}
-
-static void de21040_media_timer (unsigned long data)
-{
-	struct de_private *de = (struct de_private *) data;
-	struct net_device *dev = de->dev;
-	u32 status = dr32(SIAStatus);
-	unsigned int carrier;
-	unsigned long flags;
-
-	carrier = (status & NetCxnErr) ? 0 : 1;
-
-	if (carrier) {
-		if (de->media_type != DE_MEDIA_AUI && (status & LinkFailStatus))
-			goto no_link_yet;
-
-		de->media_timer.expires = jiffies + DE_TIMER_LINK;
-		add_timer(&de->media_timer);
-		if (!netif_carrier_ok(dev))
-			de_link_up(de);
-		else
-			netif_info(de, timer, dev, "%s link ok, status %x\n",
-				   media_name[de->media_type], status);
-		return;
-	}
-
-	de_link_down(de);
-
-	if (de->media_lock)
-		return;
-
-	if (de->media_type == DE_MEDIA_AUI) {
-		static const u32 next_state = DE_MEDIA_TP;
-		de_next_media(de, &next_state, 1);
-	} else {
-		static const u32 next_state = DE_MEDIA_AUI;
-		de_next_media(de, &next_state, 1);
-	}
-
-	spin_lock_irqsave(&de->lock, flags);
-	de_stop_rxtx(de);
-	spin_unlock_irqrestore(&de->lock, flags);
-	de_set_media(de);
-	de_start_rxtx(de);
-
-no_link_yet:
-	de->media_timer.expires = jiffies + DE_TIMER_NO_LINK;
-	add_timer(&de->media_timer);
-
-	netif_info(de, timer, dev, "no link, trying media %s, status %x\n",
-		   media_name[de->media_type], status);
-}
-
-static unsigned int de_ok_to_advertise (struct de_private *de, u32 new_media)
-{
-	switch (new_media) {
-	case DE_MEDIA_TP_AUTO:
-		if (!(de->media_advertise & ADVERTISED_Autoneg))
-			return 0;
-		if (!(de->media_advertise & (ADVERTISED_10baseT_Half | ADVERTISED_10baseT_Full)))
-			return 0;
-		break;
-	case DE_MEDIA_BNC:
-		if (!(de->media_advertise & ADVERTISED_BNC))
-			return 0;
-		break;
-	case DE_MEDIA_AUI:
-		if (!(de->media_advertise & ADVERTISED_AUI))
-			return 0;
-		break;
-	case DE_MEDIA_TP:
-		if (!(de->media_advertise & ADVERTISED_10baseT_Half))
-			return 0;
-		break;
-	case DE_MEDIA_TP_FD:
-		if (!(de->media_advertise & ADVERTISED_10baseT_Full))
-			return 0;
-		break;
-	}
-
-	return 1;
-}
-
-static void de21041_media_timer (unsigned long data)
-{
-	struct de_private *de = (struct de_private *) data;
-	struct net_device *dev = de->dev;
-	u32 status = dr32(SIAStatus);
-	unsigned int carrier;
-	unsigned long flags;
-
-	/* clear port active bits */
-	dw32(SIAStatus, NonselPortActive | SelPortActive);
-
-	carrier = (status & NetCxnErr) ? 0 : 1;
-
-	if (carrier) {
-		if ((de->media_type == DE_MEDIA_TP_AUTO ||
-		     de->media_type == DE_MEDIA_TP ||
-		     de->media_type == DE_MEDIA_TP_FD) &&
-		    (status & LinkFailStatus))
-			goto no_link_yet;
-
-		de->media_timer.expires = jiffies + DE_TIMER_LINK;
-		add_timer(&de->media_timer);
-		if (!netif_carrier_ok(dev))
-			de_link_up(de);
-		else
-			netif_info(de, timer, dev,
-				   "%s link ok, mode %x status %x\n",
-				   media_name[de->media_type],
-				   dr32(MacMode), status);
-		return;
-	}
-
-	de_link_down(de);
-
-	/* if media type locked, don't switch media */
-	if (de->media_lock)
-		goto set_media;
-
-	/* if activity detected, use that as hint for new media type */
-	if (status & NonselPortActive) {
-		unsigned int have_media = 1;
-
-		/* if AUI/BNC selected, then activity is on TP port */
-		if (de->media_type == DE_MEDIA_AUI ||
-		    de->media_type == DE_MEDIA_BNC) {
-			if (de_ok_to_advertise(de, DE_MEDIA_TP_AUTO))
-				de->media_type = DE_MEDIA_TP_AUTO;
-			else
-				have_media = 0;
-		}
-
-		/* TP selected.  If there is only TP and BNC, then it's BNC */
-		else if (((de->media_supported & DE_AUI_BNC) == SUPPORTED_BNC) &&
-			 de_ok_to_advertise(de, DE_MEDIA_BNC))
-			de->media_type = DE_MEDIA_BNC;
-
-		/* TP selected.  If there is only TP and AUI, then it's AUI */
-		else if (((de->media_supported & DE_AUI_BNC) == SUPPORTED_AUI) &&
-			 de_ok_to_advertise(de, DE_MEDIA_AUI))
-			de->media_type = DE_MEDIA_AUI;
-
-		/* otherwise, ignore the hint */
-		else
-			have_media = 0;
-
-		if (have_media)
-			goto set_media;
-	}
-
-	/*
-	 * Absent or ambiguous activity hint, move to next advertised
-	 * media state.  If de->media_type is left unchanged, this
-	 * simply resets the PHY and reloads the current media settings.
-	 */
-	if (de->media_type == DE_MEDIA_AUI) {
-		static const u32 next_states[] = {
-			DE_MEDIA_BNC, DE_MEDIA_TP_AUTO
-		};
-		de_next_media(de, next_states, ARRAY_SIZE(next_states));
-	} else if (de->media_type == DE_MEDIA_BNC) {
-		static const u32 next_states[] = {
-			DE_MEDIA_TP_AUTO, DE_MEDIA_AUI
-		};
-		de_next_media(de, next_states, ARRAY_SIZE(next_states));
-	} else {
-		static const u32 next_states[] = {
-			DE_MEDIA_AUI, DE_MEDIA_BNC, DE_MEDIA_TP_AUTO
-		};
-		de_next_media(de, next_states, ARRAY_SIZE(next_states));
-	}
-
-set_media:
-	spin_lock_irqsave(&de->lock, flags);
-	de_stop_rxtx(de);
-	spin_unlock_irqrestore(&de->lock, flags);
-	de_set_media(de);
-	de_start_rxtx(de);
-
-no_link_yet:
-	de->media_timer.expires = jiffies + DE_TIMER_NO_LINK;
-	add_timer(&de->media_timer);
-
-	netif_info(de, timer, dev, "no link, trying media %s, status %x\n",
-		   media_name[de->media_type], status);
-}
-
-static void de