upgrade all targets to Linux 2.6.34

2 files changed, 66 insertions, 6475 deletions

diff --git a/target/foxboard/patches/cris.patch b/target/foxboard/patches/cris.patch
index 3c6bca534..1a4e109e5 100644
--- a/target/foxboard/patches/cris.patch
+++ b/target/foxboard/patches/cris.patch
@@ -1,6 +1,6 @@
-diff -Nur linux-2.6.32.orig/arch/cris/arch-v10/drivers/axisflashmap.c linux-2.6.32/arch/cris/arch-v10/drivers/axisflashmap.c
---- linux-2.6.32.orig/arch/cris/arch-v10/drivers/axisflashmap.c	2009-12-03 04:51:21.000000000 +0100
-+++ linux-2.6.32/arch/cris/arch-v10/drivers/axisflashmap.c	2010-01-10 14:34:37.376309632 +0100
+diff -Nur linux-2.6.34.orig/arch/cris/arch-v10/drivers/axisflashmap.c linux-2.6.34/arch/cris/arch-v10/drivers/axisflashmap.c
+--- linux-2.6.34.orig/arch/cris/arch-v10/drivers/axisflashmap.c	2010-05-16 23:17:36.000000000 +0200
++++ linux-2.6.34/arch/cris/arch-v10/drivers/axisflashmap.c	2010-05-25 19:41:49.324723145 +0200
 @@ -113,7 +113,7 @@
  
  /* If no partition-table was found, we use this default-set. */
@@ -146,9 +146,9 @@ diff -Nur linux-2.6.32.orig/arch/cris/arch-v10/drivers/axisflashmap.c linux-2.6.
  	return err;
  }
  
-diff -Nur linux-2.6.32.orig/arch/cris/arch-v10/drivers/ds1302.c linux-2.6.32/arch/cris/arch-v10/drivers/ds1302.c
---- linux-2.6.32.orig/arch/cris/arch-v10/drivers/ds1302.c	2009-12-03 04:51:21.000000000 +0100
-+++ linux-2.6.32/arch/cris/arch-v10/drivers/ds1302.c	2010-01-10 13:41:59.256309588 +0100
+diff -Nur linux-2.6.34.orig/arch/cris/arch-v10/drivers/ds1302.c linux-2.6.34/arch/cris/arch-v10/drivers/ds1302.c
+--- linux-2.6.34.orig/arch/cris/arch-v10/drivers/ds1302.c	2010-05-16 23:17:36.000000000 +0200
++++ linux-2.6.34/arch/cris/arch-v10/drivers/ds1302.c	2010-05-25 19:41:49.361720375 +0200
 @@ -21,6 +21,7 @@
  #include <linux/delay.h>
  #include <linux/bcd.h>
@@ -181,9 +181,9 @@ diff -Nur linux-2.6.32.orig/arch/cris/arch-v10/drivers/ds1302.c linux-2.6.32/arc
          return 0;
  
  }
-diff -Nur linux-2.6.32.orig/arch/cris/arch-v10/drivers/gpio.c linux-2.6.32/arch/cris/arch-v10/drivers/gpio.c
---- linux-2.6.32.orig/arch/cris/arch-v10/drivers/gpio.c	2009-12-03 04:51:21.000000000 +0100
-+++ linux-2.6.32/arch/cris/arch-v10/drivers/gpio.c	2010-01-10 13:41:59.256309588 +0100
+diff -Nur linux-2.6.34.orig/arch/cris/arch-v10/drivers/gpio.c linux-2.6.34/arch/cris/arch-v10/drivers/gpio.c
+--- linux-2.6.34.orig/arch/cris/arch-v10/drivers/gpio.c	2010-05-16 23:17:36.000000000 +0200
++++ linux-2.6.34/arch/cris/arch-v10/drivers/gpio.c	2010-05-25 19:41:49.427216846 +0200
 @@ -21,6 +21,7 @@
  #include <linux/poll.h>
  #include <linux/init.h>
@@ -217,18 +217,18 @@ diff -Nur linux-2.6.32.orig/arch/cris/arch-v10/drivers/gpio.c linux-2.6.32/arch/
  	/* Clear all leds */
  #if defined (CONFIG_ETRAX_CSP0_LEDS) ||  defined (CONFIG_ETRAX_PA_LEDS) || defined (CONFIG_ETRAX_PB_LEDS)
  	CRIS_LED_NETWORK_SET(0);
-diff -Nur linux-2.6.32.orig/arch/cris/arch-v10/lib/hw_settings.S linux-2.6.32/arch/cris/arch-v10/lib/hw_settings.S
---- linux-2.6.32.orig/arch/cris/arch-v10/lib/hw_settings.S	2009-12-03 04:51:21.000000000 +0100
-+++ linux-2.6.32/arch/cris/arch-v10/lib/hw_settings.S	2010-01-10 13:41:59.256309588 +0100
+diff -Nur linux-2.6.34.orig/arch/cris/arch-v10/lib/hw_settings.S linux-2.6.34/arch/cris/arch-v10/lib/hw_settings.S
+--- linux-2.6.34.orig/arch/cris/arch-v10/lib/hw_settings.S	2010-05-16 23:17:36.000000000 +0200
++++ linux-2.6.34/arch/cris/arch-v10/lib/hw_settings.S	2010-05-25 19:41:49.485343082 +0200
 @@ -60,3 +60,5 @@
  	.dword R_PORT_PB_SET
  	.dword PB_SET_VALUE
  	.dword 0 ; No more register values
 +	.ascii "ACME_PART_MAGIC" 
 +	.dword 0xdeadc0de
-diff -Nur linux-2.6.32.orig/arch/cris/arch-v10/mm/init.c linux-2.6.32/arch/cris/arch-v10/mm/init.c
---- linux-2.6.32.orig/arch/cris/arch-v10/mm/init.c	2009-12-03 04:51:21.000000000 +0100
-+++ linux-2.6.32/arch/cris/arch-v10/mm/init.c	2010-01-10 13:41:59.256309588 +0100
+diff -Nur linux-2.6.34.orig/arch/cris/arch-v10/mm/init.c linux-2.6.34/arch/cris/arch-v10/mm/init.c
+--- linux-2.6.34.orig/arch/cris/arch-v10/mm/init.c	2010-05-16 23:17:36.000000000 +0200
++++ linux-2.6.34/arch/cris/arch-v10/mm/init.c	2010-05-25 19:41:49.522223225 +0200
 @@ -184,6 +184,9 @@
  
  	free_area_init_node(0, zones_size, PAGE_OFFSET >> PAGE_SHIFT, 0);
@@ -239,9 +239,9 @@ diff -Nur linux-2.6.32.orig/arch/cris/arch-v10/mm/init.c linux-2.6.32/arch/cris/
  
  /* Initialize remaps of some I/O-ports. It is important that this
   * is called before any driver is initialized.
-diff -Nur linux-2.6.32.orig/arch/cris/boot/compressed/Makefile linux-2.6.32/arch/cris/boot/compressed/Makefile
---- linux-2.6.32.orig/arch/cris/boot/compressed/Makefile	2009-12-03 04:51:21.000000000 +0100
-+++ linux-2.6.32/arch/cris/boot/compressed/Makefile	2010-01-10 13:41:59.256309588 +0100
+diff -Nur linux-2.6.34.orig/arch/cris/boot/compressed/Makefile linux-2.6.34/arch/cris/boot/compressed/Makefile
+--- linux-2.6.34.orig/arch/cris/boot/compressed/Makefile	2010-05-16 23:17:36.000000000 +0200
++++ linux-2.6.34/arch/cris/boot/compressed/Makefile	2010-05-25 19:41:49.562223178 +0200
 @@ -18,7 +18,7 @@
  OBJECTS-$(CONFIG_ETRAX_ARCH_V32) = $(obj)/head_v32.o
  OBJECTS-$(CONFIG_ETRAX_ARCH_V10) = $(obj)/head_v10.o
@@ -251,9 +251,9 @@ diff -Nur linux-2.6.32.orig/arch/cris/boot/compressed/Makefile linux-2.6.32/arch
  
  quiet_cmd_image = BUILD   $@
  cmd_image = cat $(obj)/decompress.bin $(obj)/piggy.gz > $@
-diff -Nur linux-2.6.32.orig/arch/cris/boot/compressed/misc.c linux-2.6.32/arch/cris/boot/compressed/misc.c
---- linux-2.6.32.orig/arch/cris/boot/compressed/misc.c	2009-12-03 04:51:21.000000000 +0100
-+++ linux-2.6.32/arch/cris/boot/compressed/misc.c	2010-01-10 13:41:59.256309588 +0100
+diff -Nur linux-2.6.34.orig/arch/cris/boot/compressed/misc.c linux-2.6.34/arch/cris/boot/compressed/misc.c
+--- linux-2.6.34.orig/arch/cris/boot/compressed/misc.c	2010-05-16 23:17:36.000000000 +0200
++++ linux-2.6.34/arch/cris/boot/compressed/misc.c	2010-05-25 19:41:49.602223136 +0200
 @@ -106,7 +106,7 @@
  
  static void flush_window(void);
@@ -304,9 +304,9 @@ diff -Nur linux-2.6.32.orig/arch/cris/boot/compressed/misc.c linux-2.6.32/arch/c
 -	puts("Done. Now booting the kernel\n");
 +	putstr("Done. Now booting the kernel\n");
  }
-diff -Nur linux-2.6.32.orig/arch/cris/boot/Makefile linux-2.6.32/arch/cris/boot/Makefile
---- linux-2.6.32.orig/arch/cris/boot/Makefile	2009-12-03 04:51:21.000000000 +0100
-+++ linux-2.6.32/arch/cris/boot/Makefile	2010-01-10 13:41:59.256309588 +0100
+diff -Nur linux-2.6.34.orig/arch/cris/boot/Makefile linux-2.6.34/arch/cris/boot/Makefile
+--- linux-2.6.34.orig/arch/cris/boot/Makefile	2010-05-16 23:17:36.000000000 +0200
++++ linux-2.6.34/arch/cris/boot/Makefile	2010-05-25 19:41:49.642223132 +0200
 @@ -5,7 +5,7 @@
  objcopyflags-$(CONFIG_ETRAX_ARCH_V10) += -R .note -R .comment
  objcopyflags-$(CONFIG_ETRAX_ARCH_V32) += --remove-section=.bss
@@ -324,10 +324,10 @@ diff -Nur linux-2.6.32.orig/arch/cris/boot/Makefile linux-2.6.32/arch/cris/boot/
  
  $(obj)/zImage:  $(obj)/compressed/vmlinux
  	@cp $< $@
-diff -Nur linux-2.6.32.orig/arch/cris/Kconfig linux-2.6.32/arch/cris/Kconfig
---- linux-2.6.32.orig/arch/cris/Kconfig	2009-12-03 04:51:21.000000000 +0100
-+++ linux-2.6.32/arch/cris/Kconfig	2010-01-10 13:41:59.256309588 +0100
-@@ -168,6 +168,12 @@
+diff -Nur linux-2.6.34.orig/arch/cris/Kconfig linux-2.6.34/arch/cris/Kconfig
+--- linux-2.6.34.orig/arch/cris/Kconfig	2010-05-16 23:17:36.000000000 +0200
++++ linux-2.6.34/arch/cris/Kconfig	2010-05-25 19:41:49.692223112 +0200
+@@ -174,6 +174,12 @@
  	help
  	  Size of DRAM (decimal in MB) typically 2, 8 or 16.
  
@@ -340,7 +340,7 @@ diff -Nur linux-2.6.32.orig/arch/cris/Kconfig linux-2.6.32/arch/cris/Kconfig
  config ETRAX_VMEM_SIZE
         int "Video memory size (dec, in MB)"
         depends on ETRAX_ARCH_V32 && !ETRAXFS
-@@ -273,7 +279,7 @@
+@@ -279,7 +285,7 @@
  	select MTD_CFI_AMDSTD
  	select MTD_JEDECPROBE if ETRAX_ARCH_V32
  	select MTD_CHAR
@@ -349,7 +349,7 @@ diff -Nur linux-2.6.32.orig/arch/cris/Kconfig linux-2.6.32/arch/cris/Kconfig
  	select MTD_PARTITIONS
  	select MTD_CONCAT
  	select MTD_COMPLEX_MAPPINGS
-@@ -662,6 +668,11 @@
+@@ -668,6 +674,11 @@
  
  source "drivers/ide/Kconfig"
  
@@ -361,9 +361,9 @@ diff -Nur linux-2.6.32.orig/arch/cris/Kconfig linux-2.6.32/arch/cris/Kconfig
  source "drivers/net/Kconfig"
  
  source "drivers/i2c/Kconfig"
-diff -Nur linux-2.6.32.orig/arch/cris/Makefile linux-2.6.32/arch/cris/Makefile
---- linux-2.6.32.orig/arch/cris/Makefile	2009-12-03 04:51:21.000000000 +0100
-+++ linux-2.6.32/arch/cris/Makefile	2010-01-10 13:41:59.256309588 +0100
+diff -Nur linux-2.6.34.orig/arch/cris/Makefile linux-2.6.34/arch/cris/Makefile
+--- linux-2.6.34.orig/arch/cris/Makefile	2010-05-16 23:17:36.000000000 +0200
++++ linux-2.6.34/arch/cris/Makefile	2010-05-25 19:41:49.751101855 +0200
 @@ -40,10 +40,10 @@
  
  LD = $(CROSS_COMPILE)ld -mcrislinux
@@ -377,10 +377,10 @@ diff -Nur linux-2.6.32.orig/arch/cris/Makefile linux-2.6.32/arch/cris/Makefile
  KBUILD_CPPFLAGS += $(inc)
  
  ifdef CONFIG_FRAME_POINTER
-diff -Nur linux-2.6.32.orig/drivers/net/cris/eth_v10.c linux-2.6.32/drivers/net/cris/eth_v10.c
---- linux-2.6.32.orig/drivers/net/cris/eth_v10.c	2009-12-03 04:51:21.000000000 +0100
-+++ linux-2.6.32/drivers/net/cris/eth_v10.c	2010-01-10 13:41:59.256309588 +0100
-@@ -1725,7 +1725,7 @@
+diff -Nur linux-2.6.34.orig/drivers/net/cris/eth_v10.c linux-2.6.34/drivers/net/cris/eth_v10.c
+--- linux-2.6.34.orig/drivers/net/cris/eth_v10.c	2010-05-16 23:17:36.000000000 +0200
++++ linux-2.6.34/drivers/net/cris/eth_v10.c	2010-05-25 19:41:49.809234068 +0200
+@@ -1722,7 +1722,7 @@
  static void
  e100_netpoll(struct net_device* netdev)
  {
@@ -389,1773 +389,9 @@ diff -Nur linux-2.6.32.orig/drivers/net/cris/eth_v10.c linux-2.6.32/drivers/net/
  }
  #endif
  
-diff -Nur linux-2.6.32.orig/drivers/net/cris/eth_v10.c.orig linux-2.6.32/drivers/net/cris/eth_v10.c.orig
---- linux-2.6.32.orig/drivers/net/cris/eth_v10.c.orig	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.32/drivers/net/cris/eth_v10.c.orig	2009-12-03 04:51:21.000000000 +0100
-@@ -0,0 +1,1760 @@
-+/*
-+ * e100net.c: A network driver for the ETRAX 100LX network controller.
-+ *
-+ * Copyright (c) 1998-2002 Axis Communications AB.
-+ *
-+ * The outline of this driver comes from skeleton.c.
-+ *
-+ */
-+
-+
-+#include <linux/module.h>
-+
-+#include <linux/kernel.h>
-+#include <linux/delay.h>
-+#include <linux/types.h>
-+#include <linux/fcntl.h>
-+#include <linux/interrupt.h>
-+#include <linux/ptrace.h>
-+#include <linux/ioport.h>
-+#include <linux/in.h>
-+#include <linux/slab.h>
-+#include <linux/string.h>
-+#include <linux/spinlock.h>
-+#include <linux/errno.h>
-+#include <linux/init.h>
-+#include <linux/bitops.h>
-+
-+#include <linux/if.h>
-+#include <linux/mii.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/skbuff.h>
-+#include <linux/ethtool.h>
-+
-+#include <arch/svinto.h>/* DMA and register descriptions */
-+#include <asm/io.h>         /* CRIS_LED_* I/O functions */
-+#include <asm/irq.h>
-+#include <asm/dma.h>
-+#include <asm/system.h>
-+#include <asm/ethernet.h>
-+#include <asm/cache.h>
-+#include <arch/io_interface_mux.h>
-+
-+//#define ETHDEBUG
-+#define D(x)
-+
-+/*
-+ * The name of the card. Is used for messages and in the requests for
-+ * io regions, irqs and dma channels
-+ */
-+
-+static const char* cardname = "ETRAX 100LX built-in ethernet controller";
-+
-+/* A default ethernet address. Highlevel SW will set the real one later */
-+
-+static struct sockaddr default_mac = {
-+	0,
-+	{ 0x00, 0x40, 0x8C, 0xCD, 0x00, 0x00 }
-+};
-+
-+/* Information that need to be kept for each board. */
-+struct net_local {
-+	struct net_device_stats stats;
-+	struct mii_if_info mii_if;
-+
-+	/* Tx control lock.  This protects the transmit buffer ring
-+	 * state along with the "tx full" state of the driver.  This
-+	 * means all netif_queue flow control actions are protected
-+	 * by this lock as well.
-+	 */
-+	spinlock_t lock;
-+
-+	spinlock_t led_lock; /* Protect LED state */
-+	spinlock_t transceiver_lock; /* Protect transceiver state. */
-+};
-+
-+typedef struct etrax_eth_descr
-+{
-+	etrax_dma_descr descr;
-+	struct sk_buff* skb;
-+} etrax_eth_descr;
-+
-+/* Some transceivers requires special handling */
-+struct transceiver_ops
-+{
-+	unsigned int oui;
-+	void (*check_speed)(struct net_device* dev);
-+	void (*check_duplex)(struct net_device* dev);
-+};
-+
-+/* Duplex settings */
-+enum duplex
-+{
-+	half,
-+	full,
-+	autoneg
-+};
-+
-+/* Dma descriptors etc. */
-+
-+#define MAX_MEDIA_DATA_SIZE 1522
-+
-+#define MIN_PACKET_LEN      46
-+#define ETHER_HEAD_LEN      14
-+
-+/*
-+** MDIO constants.
-+*/
-+#define MDIO_START                          0x1
-+#define MDIO_READ                           0x2
-+#define MDIO_WRITE                          0x1
-+#define MDIO_PREAMBLE              0xfffffffful
-+
-+/* Broadcom specific */
-+#define MDIO_AUX_CTRL_STATUS_REG           0x18
-+#define MDIO_BC_FULL_DUPLEX_IND             0x1
-+#define MDIO_BC_SPEED                       0x2
-+
-+/* TDK specific */
-+#define MDIO_TDK_DIAGNOSTIC_REG              18
-+#define MDIO_TDK_DIAGNOSTIC_RATE          0x400
-+#define MDIO_TDK_DIAGNOSTIC_DPLX          0x800
-+
-+/*Intel LXT972A specific*/
-+#define MDIO_INT_STATUS_REG_2			0x0011
-+#define MDIO_INT_FULL_DUPLEX_IND       (1 << 9)
-+#define MDIO_INT_SPEED                (1 << 14)
-+
-+/* Network flash constants */
-+#define NET_FLASH_TIME                  (HZ/50) /* 20 ms */
-+#define NET_FLASH_PAUSE                (HZ/100) /* 10 ms */
-+#define NET_LINK_UP_CHECK_INTERVAL       (2*HZ) /* 2 s   */
-+#define NET_DUPLEX_CHECK_INTERVAL        (2*HZ) /* 2 s   */
-+
-+#define NO_NETWORK_ACTIVITY 0
-+#define NETWORK_ACTIVITY    1
-+
-+#define NBR_OF_RX_DESC     32
-+#define NBR_OF_TX_DESC     16
-+
-+/* Large packets are sent directly to upper layers while small packets are */
-+/* copied (to reduce memory waste). The following constant decides the breakpoint */
-+#define RX_COPYBREAK 256
-+
-+/* Due to a chip bug we need to flush the cache when descriptors are returned */
-+/* to the DMA. To decrease performance impact we return descriptors in chunks. */
-+/* The following constant determines the number of descriptors to return. */
-+#define RX_QUEUE_THRESHOLD  NBR_OF_RX_DESC/2
-+
-+#define GET_BIT(bit,val)   (((val) >> (bit)) & 0x01)
-+
-+/* Define some macros to access ETRAX 100 registers */
-+#define SETF(var, reg, field, val) var = (var & ~IO_MASK_(reg##_, field##_)) | \
-+					  IO_FIELD_(reg##_, field##_, val)
-+#define SETS(var, reg, field, val) var = (var & ~IO_MASK_(reg##_, field##_)) | \
-+					  IO_STATE_(reg##_, field##_, _##val)
-+
-+static etrax_eth_descr *myNextRxDesc;  /* Points to the next descriptor to
-+                                          to be processed */
-+static etrax_eth_descr *myLastRxDesc;  /* The last processed descriptor */
-+
-+static etrax_eth_descr RxDescList[NBR_OF_RX_DESC] __attribute__ ((aligned(32)));
-+
-+static etrax_eth_descr* myFirstTxDesc; /* First packet not yet sent */
-+static etrax_eth_descr* myLastTxDesc;  /* End of send queue */
-+static etrax_eth_descr* myNextTxDesc;  /* Next descriptor to use */
-+static etrax_eth_descr TxDescList[NBR_OF_TX_DESC] __attribute__ ((aligned(32)));
-+
-+static unsigned int network_rec_config_shadow = 0;
-+
-+static unsigned int network_tr_ctrl_shadow = 0;
-+
-+/* Network speed indication. */
-+static DEFINE_TIMER(speed_timer, NULL, 0, 0);
-+static DEFINE_TIMER(clear_led_timer, NULL, 0, 0);
-+static int current_speed; /* Speed read from transceiver */
-+static int current_speed_selection; /* Speed selected by user */
-+static unsigned long led_next_time;
-+static int led_active;
-+static int rx_queue_len;
-+
-+/* Duplex */
-+static DEFINE_TIMER(duplex_timer, NULL, 0, 0);
-+static int full_duplex;
-+static enum duplex current_duplex;
-+
-+/* Index to functions, as function prototypes. */
-+
-+static int etrax_ethernet_init(void);
-+
-+static int e100_open(struct net_device *dev);
-+static int e100_set_mac_address(struct net_device *dev, void *addr);
-+static int e100_send_packet(struct sk_buff *skb, struct net_device *dev);
-+static irqreturn_t e100rxtx_interrupt(int irq, void *dev_id);
-+static irqreturn_t e100nw_interrupt(int irq, void *dev_id);
-+static void e100_rx(struct net_device *dev);
-+static int e100_close(struct net_device *dev);
-+static int e100_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
-+static int e100_set_config(struct net_device* dev, struct ifmap* map);
-+static void e100_tx_timeout(struct net_device *dev);
-+static struct net_device_stats *e100_get_stats(struct net_device *dev);
-+static void set_multicast_list(struct net_device *dev);
-+static void e100_hardware_send_packet(struct net_local* np, char *buf, int length);
-+static void update_rx_stats(struct net_device_stats *);
-+static void update_tx_stats(struct net_device_stats *);
-+static int e100_probe_transceiver(struct net_device* dev);
-+
-+static void e100_check_speed(unsigned long priv);
-+static void e100_set_speed(struct net_device* dev, unsigned long speed);
-+static void e100_check_duplex(unsigned long priv);
-+static void e100_set_duplex(struct net_device* dev, enum duplex);
-+static void e100_negotiate(struct net_device* dev);
-+
-+static int e100_get_mdio_reg(struct net_device *dev, int phy_id, int location);
-+static void e100_set_mdio_reg(struct net_device *dev, int phy_id, int location, int value);
-+
-+static void e100_send_mdio_cmd(unsigned short cmd, int write_cmd);
-+static void e100_send_mdio_bit(unsigned char bit);
-+static unsigned char e100_receive_mdio_bit(void);
-+static void e100_reset_transceiver(struct net_device* net);
-+
-+static void e100_clear_network_leds(unsigned long dummy);
-+static void e100_set_network_leds(int active);
-+
-+static const struct ethtool_ops e100_ethtool_ops;
-+#if defined(CONFIG_ETRAX_NO_PHY)
-+static void dummy_check_speed(struct net_device* dev);
-+static void dummy_check_duplex(struct net_device* dev);
-+#else
-+static void broadcom_check_speed(struct net_device* dev);
-+static void broadcom_check_duplex(struct net_device* dev);
-+static void tdk_check_speed(struct net_device* dev);
-+static void tdk_check_duplex(struct net_device* dev);
-+static void intel_check_speed(struct net_device* dev);
-+static void intel_check_duplex(struct net_device* dev);
-+static void generic_check_speed(struct net_device* dev);
-+static void generic_check_duplex(struct net_device* dev);
-+#endif
-+#ifdef CONFIG_NET_POLL_CONTROLLER
-+static void e100_netpoll(struct net_device* dev);
-+#endif
-+
-+static int autoneg_normal = 1;
-+
-+struct transceiver_ops transceivers[] =
-+{
-+#if defined(CONFIG_ETRAX_NO_PHY)
-+	{0x0000, dummy_check_speed, dummy_check_duplex}        /* Dummy */
-+#else
-+	{0x1018, broadcom_check_speed, broadcom_check_duplex},  /* Broadcom */
-+	{0xC039, tdk_check_speed, tdk_check_duplex},            /* TDK 2120 */
-+	{0x039C, tdk_check_speed, tdk_check_duplex},            /* TDK 2120C */
-+        {0x04de, intel_check_speed, intel_check_duplex},     	/* Intel LXT972A*/
-+	{0x0000, generic_check_speed, generic_check_duplex}     /* Generic, must be last */
-+#endif
-+};
-+
-+struct transceiver_ops* transceiver = &transceivers[0];
-+
-+static const struct net_device_ops e100_netdev_ops = {
-+	.ndo_open		= e100_open,
-+	.ndo_stop		= e100_close,
-+	.ndo_start_xmit		= e100_send_packet,
-+	.ndo_tx_timeout		= e100_tx_timeout,
-+	.ndo_get_stats		= e100_get_stats,
-+	.ndo_set_multicast_list	= set_multicast_list,
-+	.ndo_do_ioctl		= e100_ioctl,
-+	.ndo_set_mac_address	= e100_set_mac_address,
-+	.ndo_validate_addr	= eth_validate_addr,
-+	.ndo_change_mtu		= eth_change_mtu,
-+	.ndo_set_config		= e100_set_config,
-+#ifdef CONFIG_NET_POLL_CONTROLLER
-+	.ndo_poll_controller	= e100_netpoll,
-+#endif
-+};
-+
-+#define tx_done(dev) (*R_DMA_CH0_CMD == 0)
-+
-+/*
-+ * Check for a network adaptor of this type, and return '0' if one exists.
-+ * If dev->base_addr == 0, probe all likely locations.
-+ * If dev->base_addr == 1, always return failure.
-+ * If dev->base_addr == 2, allocate space for the device and return success
-+ * (detachable devices only).
-+ */
-+
-+static int __init
-+etrax_ethernet_init(void)
-+{
-+	struct net_device *dev;
-+        struct net_local* np;
-+	int i, err;
-+
-+	printk(KERN_INFO
-+	       "ETRAX 100LX 10/100MBit ethernet v2.0 (c) 1998-2007 Axis Communications AB\n");
-+
-+	if (cris_request_io_interface(if_eth, cardname)) {
-+		printk(KERN_CRIT "etrax_ethernet_init failed to get IO interface\n");
-+		return -EBUSY;
-+	}
-+
-+	dev = alloc_etherdev(sizeof(struct net_local));
-+	if (!dev)
-+		return -ENOMEM;
-+
-+	np = netdev_priv(dev);
-+
-+	/* we do our own locking */
-+	dev->features |= NETIF_F_LLTX;
-+
-+	dev->base_addr = (unsigned int)R_NETWORK_SA_0; /* just to have something to show */
-+
-+	/* now setup our etrax specific stuff */
-+
-+	dev->irq = NETWORK_DMA_RX_IRQ_NBR; /* we really use DMATX as well... */
-+	dev->dma = NETWORK_RX_DMA_NBR;
-+
-+	/* fill in our handlers so the network layer can talk to us in the future */
-+
-+	dev->ethtool_ops	= &e100_ethtool_ops;
-+	dev->netdev_ops		= &e100_netdev_ops;
-+
-+	spin_lock_init(&np->lock);
-+	spin_lock_init(&np->led_lock);
-+	spin_lock_init(&np->transceiver_lock);
-+
-+	/* Initialise the list of Etrax DMA-descriptors */
-+
-+	/* Initialise receive descriptors */
-+
-+	for (i = 0; i < NBR_OF_RX_DESC; i++) {
-+		/* Allocate two extra cachelines to make sure that buffer used
-+		 * by DMA does not share cacheline with any other data (to
-+		 * avoid cache bug)
-+		 */
-+		RxDescList[i].skb = dev_alloc_skb(MAX_MEDIA_DATA_SIZE + 2 * L1_CACHE_BYTES);
-+		if (!RxDescList[i].skb)
-+			return -ENOMEM;
-+		RxDescList[i].descr.ctrl   = 0;
-+		RxDescList[i].descr.sw_len = MAX_MEDIA_DATA_SIZE;
-+		RxDescList[i].descr.next   = virt_to_phys(&RxDescList[i + 1]);
-+		RxDescList[i].descr.buf    = L1_CACHE_ALIGN(virt_to_phys(RxDescList[i].skb->data));
-+		RxDescList[i].descr.status = 0;
-+		RxDescList[i].descr.hw_len = 0;
-+		prepare_rx_descriptor(&RxDescList[i].descr);
-+	}
-+
-+	RxDescList[NBR_OF_RX_DESC - 1].descr.ctrl   = d_eol;
-+	RxDescList[NBR_OF_RX_DESC - 1].descr.next   = virt_to_phys(&RxDescList[0]);
-+	rx_queue_len = 0;
-+
-+	/* Initialize transmit descriptors */
-+	for (i = 0; i < NBR_OF_TX_DESC; i++) {
-+		TxDescList[i].descr.ctrl   = 0;
-+		TxDescList[i].descr.sw_len = 0;
-+		TxDescList[i].descr.next   = virt_to_phys(&TxDescList[i + 1].descr);
-+		TxDescList[i].descr.buf    = 0;
-+		TxDescList[i].descr.status = 0;
-+		TxDescList[i].descr.hw_len = 0;
-+		TxDescList[i].skb = 0;
-+	}
-+
-+	TxDescList[NBR_OF_TX_DESC - 1].descr.ctrl   = d_eol;
-+	TxDescList[NBR_OF_TX_DESC - 1].descr.next   = virt_to_phys(&TxDescList[0].descr);
-+
-+	/* Initialise initial pointers */
-+
-+	myNextRxDesc  = &RxDescList[0];
-+	myLastRxDesc  = &RxDescList[NBR_OF_RX_DESC - 1];
-+	myFirstTxDesc = &TxDescList[0];
-+	myNextTxDesc  = &TxDescList[0];
-+	myLastTxDesc  = &TxDescList[NBR_OF_TX_DESC - 1];
-+
-+	/* Register device */
-+	err = register_netdev(dev);
-+	if (err) {
-+		free_netdev(dev);
-+		return err;
-+	}
-+
-+	/* set the default MAC address */
-+
-+	e100_set_mac_address(dev, &default_mac);
-+
-+	/* Initialize speed indicator stuff. */
-+
-+	current_speed = 10;
-+	current_speed_selection = 0; /* Auto */
-+	speed_timer.expires = jiffies + NET_LINK_UP_CHECK_INTERVAL;
-+	speed_timer.data = (unsigned long)dev;
-+	speed_timer.function = e100_check_speed;
-+
-+	clear_led_timer.function = e100_clear_network_leds;
-+	clear_led_timer.data = (unsigned long)dev;
-+
-+	full_duplex = 0;
-+	current_duplex = autoneg;
-+	duplex_timer.expires = jiffies + NET_DUPLEX_CHECK_INTERVAL;
-+        duplex_timer.data = (unsigned long)dev;
-+	duplex_timer.function = e100_check_duplex;
-+
-+        /* Initialize mii interface */
-+	np->mii_if.phy_id_mask = 0x1f;
-+	np->mii_if.reg_num_mask = 0x1f;
-+	np->mii_if.dev = dev;
-+	np->mii_if.mdio_read = e100_get_mdio_reg;
-+	np->mii_if.mdio_write = e100_set_mdio_reg;
-+
-+	/* Initialize group address registers to make sure that no */
-+	/* unwanted addresses are matched */
-+	*R_NETWORK_GA_0 = 0x00000000;
-+	*R_NETWORK_GA_1 = 0x00000000;
-+
-+	/* Initialize next time the led can flash */
-+	led_next_time = jiffies;
-+	return 0;
-+}
-+
-+/* set MAC address of the interface. called from the core after a
-+ * SIOCSIFADDR ioctl, and from the bootup above.
-+ */
-+
-+static int
-+e100_set_mac_address(struct net_device *dev, void *p)
-+{
-+	struct net_local *np = netdev_priv(dev);
-+	struct sockaddr *addr = p;
-+
-+	spin_lock(&np->lock); /* preemption protection */
-+
-+	/* remember it */
-+
-+	memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
-+
-+	/* Write it to the hardware.
-+	 * Note the way the address is wrapped:
-+	 * *R_NETWORK_SA_0 = a0_0 | (a0_1 << 8) | (a0_2 << 16) | (a0_3 << 24);
-+	 * *R_NETWORK_SA_1 = a0_4 | (a0_5 << 8);
-+	 */
-+
-+	*R_NETWORK_SA_0 = dev->dev_addr[0] | (dev->dev_addr[1] << 8) |
-+		(dev->dev_addr[2] << 16) | (dev->dev_addr[3] << 24);
-+	*R_NETWORK_SA_1 = dev->dev_addr[4] | (dev->dev_addr[5] << 8);
-+	*R_NETWORK_SA_2 = 0;
-+
-+	/* show it in the log as well */
-+
-+	printk(KERN_INFO "%s: changed MAC to %pM\n", dev->name, dev->dev_addr);
-+
-+	spin_unlock(&np->lock);
-+
-+	return 0;
-+}
-+
-+/*
-+ * Open/initialize the board. This is called (in the current kernel)
-+ * sometime after booting when the 'ifconfig' program is run.
-+ *
-+ * This routine should set everything up anew at each open, even
-+ * registers that "should" only need to be set once at boot, so that
-+ * there is non-reboot way to recover if something goes wrong.
-+ */
-+
-+static int
-+e100_open(struct net_device *dev)
-+{
-+	unsigned long flags;
-+
-+	/* enable the MDIO output pin */
-+
-+	*R_NETWORK_MGM_CTRL = IO_STATE(R_NETWORK_MGM_CTRL, mdoe, enable);
-+
-+	*R_IRQ_MASK0_CLR =
-+		IO_STATE(R_IRQ_MASK0_CLR, overrun, clr) |
-+		IO_STATE(R_IRQ_MASK0_CLR, underrun, clr) |
-+		IO_STATE(R_IRQ_MASK0_CLR, excessive_col, clr);
-+
-+	/* clear dma0 and 1 eop and descr irq masks */
-+	*R_IRQ_MASK2_CLR =
-+		IO_STATE(R_IRQ_MASK2_CLR, dma0_descr, clr) |
-+		IO_STATE(R_IRQ_MASK2_CLR, dma0_eop, clr) |
-+		IO_STATE(R_IRQ_MASK2_CLR, dma1_descr, clr) |
-+		IO_STATE(R_IRQ_MASK2_CLR, dma1_eop, clr);
-+
-+	/* Reset and wait for the DMA channels */
-+
-+	RESET_DMA(NETWORK_TX_DMA_NBR);
-+	RESET_DMA(NETWORK_RX_DMA_NBR);
-+	WAIT_DMA(NETWORK_TX_DMA_NBR);
-+	WAIT_DMA(NETWORK_RX_DMA_NBR);
-+
-+	/* Initialise the etrax network controller */
-+
-+	/* allocate the irq corresponding to the receiving DMA */
-+
-+	if (request_irq(NETWORK_DMA_RX_IRQ_NBR, e100rxtx_interrupt,
-+			IRQF_SAMPLE_RANDOM, cardname, (void *)dev)) {
-+		goto grace_exit0;
-+	}
-+
-+	/* allocate the irq corresponding to the transmitting DMA */
-+
-+	if (request_irq(NETWORK_DMA_TX_IRQ_NBR, e100rxtx_interrupt, 0,
-+			cardname, (void *)dev)) {
-+		goto grace_exit1;
-+	}
-+
-+	/* allocate the irq corresponding to the network errors etc */
-+
-+	if (request_irq(NETWORK_STATUS_IRQ_NBR, e100nw_interrupt, 0,
-+			cardname, (void *)dev)) {
-+		goto grace_exit2;
-+	}
-+
-+	/*
-+	 * Always allocate the DMA channels after the IRQ,
-+	 * and clean up on failure.
-+	 */
-+
-+	if (cris_request_dma(NETWORK_TX_DMA_NBR,
-+	                     cardname,
-+	                     DMA_VERBOSE_ON_ERROR,
-+	                     dma_eth)) {
-+		goto grace_exit3;
-+        }
-+
-+	if (cris_request_dma(NETWORK_RX_DMA_NBR,
-+	                     cardname,
-+	                     DMA_VERBOSE_ON_ERROR,
-+	                     dma_eth)) {
-+		goto grace_exit4;
-+        }
-+
-+	/* give the HW an idea of what MAC address we want */
-+
-+	*R_NETWORK_SA_0 = dev->dev_addr[0] | (dev->dev_addr[1] << 8) |
-+		(dev->dev_addr[2] << 16) | (dev->dev_addr[3] << 24);
-+	*R_NETWORK_SA_1 = dev->dev_addr[4] | (dev->dev_addr[5] << 8);
-+	*R_NETWORK_SA_2 = 0;
-+
-+#if 0
-+	/* use promiscuous mode for testing */
-+	*R_NETWORK_GA_0 = 0xffffffff;
-+	*R_NETWORK_GA_1 = 0xffffffff;
-+
-+	*R_NETWORK_REC_CONFIG = 0xd; /* broadcast rec, individ. rec, ma0 enabled */
-+#else
-+	SETS(network_rec_config_shadow, R_NETWORK_REC_CONFIG, max_size, size1522);
-+	SETS(network_rec_config_shadow, R_NETWORK_REC_CONFIG, broadcast, receive);
-+	SETS(network_rec_config_shadow, R_NETWORK_REC_CONFIG, ma0, enable);
-+	SETF(network_rec_config_shadow, R_NETWORK_REC_CONFIG, duplex, full_duplex);
-+	*R_NETWORK_REC_CONFIG = network_rec_config_shadow;
-+#endif
-+
-+	*R_NETWORK_GEN_CONFIG =
-+		IO_STATE(R_NETWORK_GEN_CONFIG, phy,    mii_clk) |
-+		IO_STATE(R_NETWORK_GEN_CONFIG, enable, on);
-+
-+	SETS(network_tr_ctrl_shadow, R_NETWORK_TR_CTRL, clr_error, clr);
-+	SETS(network_tr_ctrl_shadow, R_NETWORK_TR_CTRL, delay, none);
-+	SETS(network_tr_ctrl_shadow, R_NETWORK_TR_CTRL, cancel, dont);
-+	SETS(network_tr_ctrl_shadow, R_NETWORK_TR_CTRL, cd, enable);
-+	SETS(network_tr_ctrl_shadow, R_NETWORK_TR_CTRL, retry, enable);
-+	SETS(network_tr_ctrl_shadow, R_NETWORK_TR_CTRL, pad, enable);
-+	SETS(network_tr_ctrl_shadow, R_NETWORK_TR_CTRL, crc, enable);
-+	*R_NETWORK_TR_CTRL = network_tr_ctrl_shadow;
-+
-+	local_irq_save(flags);
-+
-+	/* enable the irq's for ethernet DMA */
-+
-+	*R_IRQ_MASK2_SET =
-+		IO_STATE(R_IRQ_MASK2_SET, dma0_eop, set) |
-+		IO_STATE(R_IRQ_MASK2_SET, dma1_eop, set);
-+
-+	*R_IRQ_MASK0_SET =
-+		IO_STATE(R_IRQ_MASK0_SET, overrun,       set) |
-+		IO_STATE(R_IRQ_MASK0_SET, underrun,      set) |
-+		IO_STATE(R_IRQ_MASK0_SET, excessive_col, set);
-+
-+	/* make sure the irqs are cleared */
-+
-+	*R_DMA_CH0_CLR_INTR = IO_STATE(R_DMA_CH0_CLR_INTR, clr_eop, do);
-+	*R_DMA_CH1_CLR_INTR = IO_STATE(R_DMA_CH1_CLR_INTR, clr_eop, do);
-+
-+	/* make sure the rec and transmit error counters are cleared */
-+
-+	(void)*R_REC_COUNTERS;  /* dummy read */
-+	(void)*R_TR_COUNTERS;   /* dummy read */
-+
-+	/* start the receiving DMA channel so we can receive packets from now on */
-+
-+	*R_DMA_CH1_FIRST = virt_to_phys(myNextRxDesc);
-+	*R_DMA_CH1_CMD = IO_STATE(R_DMA_CH1_CMD, cmd, start);
-+
-+	/* Set up transmit DMA channel so it can be restarted later */
-+
-+	*R_DMA_CH0_FIRST = 0;
-+	*R_DMA_CH0_DESCR = virt_to_phys(myLastTxDesc);
-+	netif_start_queue(dev);
-+
-+	local_irq_restore(flags);
-+
-+	/* Probe for transceiver */
-+	if (e100_probe_transceiver(dev))
-+		goto grace_exit5;
-+
-+	/* Start duplex/speed timers */
-+	add_timer(&speed_timer);
-+	add_timer(&duplex_timer);
-+
-+	/* We are now ready to accept transmit requeusts from
-+	 * the queueing layer of the networking.
-+	 */
-+	netif_carrier_on(dev);
-+
-+	return 0;
-+
-+grace_exit5:
-+	cris_free_dma(NETWORK_RX_DMA_NBR, cardname);
-+grace_exit4:
-+	cris_free_dma(NETWORK_TX_DMA_NBR, cardname);
-+grace_exit3:
-+	free_irq(NETWORK_STATUS_IRQ_NBR, (void *)dev);
-+grace_exit2:
-+	free_irq(NETWORK_DMA_TX_IRQ_NBR, (void *)dev);
-+grace_exit1:
-+	free_irq(NETWORK_DMA_RX_IRQ_NBR, (void *)dev);
-+grace_exit0:
-+	return -EAGAIN;
-+}
-+
-+#if defined(CONFIG_ETRAX_NO_PHY)
-+static void
-+dummy_check_speed(struct net_device* dev)
-+{
-+	current_speed = 100;
-+}
-+#else
-+static void
-+generic_check_speed(struct net_device* dev)
-+{
-+	unsigned long data;
-+	struct net_local *np = netdev_priv(dev);
-+
-+	data = e100_get_mdio_reg(dev, np->mii_if.phy_id, MII_ADVERTISE);
-+	if ((data & ADVERTISE_100FULL) ||
-+	    (data & ADVERTISE_100HALF))
-+		current_speed = 100;
-+	else
-+		current_speed = 10;
-+}
-+
-+static void
-+tdk_check_speed(struct net_device* dev)
-+{
-+	unsigned long data;
-+	struct net_local *np = netdev_priv(dev);
-+
-+	data = e100_get_mdio_reg(dev, np->mii_if.phy_id,
-+				 MDIO_TDK_DIAGNOSTIC_REG);
-+	current_speed = (data & MDIO_TDK_DIAGNOSTIC_RATE ? 100 : 10);
-+}
-+
-+static void
-+broadcom_check_speed(struct net_device* dev)
-+{
-+	unsigned long data;
-+	struct net_local *np = netdev_priv(dev);
-+
-+	data = e100_get_mdio_reg(dev, np->mii_if.phy_id,
-+				 MDIO_AUX_CTRL_STATUS_REG);
-+	current_speed = (data & MDIO_BC_SPEED ? 100 : 10);
-+}
-+
-+static void
-+intel_check_speed(struct net_device* dev)
-+{
-+	unsigned long data;
-+	struct net_local *np = netdev_priv(dev);
-+
-+	data = e100_get_mdio_reg(dev, np->mii_if.phy_id,
-+				 MDIO_INT_STATUS_REG_2);
-+	current_speed = (data & MDIO_INT_SPEED ? 100 : 10);
-+}
-+#endif
-+static void
-+e100_check_speed(unsigned long priv)
-+{
-+	struct net_device* dev = (struct net_device*)priv;
-+	struct net_local *np = netdev_priv(dev);
-+	static int led_initiated = 0;
-+	unsigned long data;
-+	int old_speed = current_speed;
-+
-+	spin_lock(&np->transceiver_lock);
-+
-+	data = e100_get_mdio_reg(dev, np->mii_if.phy_id, MII_BMSR);
-+	if (!(data & BMSR_LSTATUS)) {
-+		current_speed = 0;
-+	} else {
-+		transceiver->check_speed(dev);
-+	}
-+
-+	spin_lock(&np->led_lock);
-+	if ((old_speed != current_speed) || !led_initiated) {
-+		led_initiated = 1;
-+		e100_set_network_leds(NO_NETWORK_ACTIVITY);
-+		if (current_speed)
-+			netif_carrier_on(dev);
-+		else
-+			netif_carrier_off(dev);
-+	}
-+	spin_unlock(&np->led_lock);
-+
-+	/* Reinitialize the timer. */
-+	speed_timer.expires = jiffies + NET_LINK_UP_CHECK_INTERVAL;
-+	add_timer(&speed_timer);
-+
-+	spin_unlock(&np->transceiver_lock);
-+}
-+
-+static void
-+e100_negotiate(struct net_device* dev)
-+{
-+	struct net_local *np = netdev_priv(dev);
-+	unsigned short data = e100_get_mdio_reg(dev, np->mii_if.phy_id,
-+						MII_ADVERTISE);
-+
-+	/* Discard old speed and duplex settings */
-+	data &= ~(ADVERTISE_100HALF | ADVERTISE_100FULL |
-+	          ADVERTISE_10HALF | ADVERTISE_10FULL);
-+
-+	switch (current_speed_selection) {
-+		case 10:
-+			if (current_duplex == full)
-+				data |= ADVERTISE_10FULL;
-+			else if (current_duplex == half)
-+				data |= ADVERTISE_10HALF;
-+			else
-+				data |= ADVERTISE_10HALF | ADVERTISE_10FULL;
-+			break;
-+
-+		case 100:
-+			 if (current_duplex == full)
-+				data |= ADVERTISE_100FULL;
-+			else if (current_duplex == half)
-+				data |= ADVERTISE_100HALF;
-+			else
-+				data |= ADVERTISE_100HALF | ADVERTISE_100FULL;
-+			break;
-+
-+		case 0: /* Auto */
-+			 if (current_duplex == full)
-+				data |= ADVERTISE_100FULL | ADVERTISE_10FULL;
-+			else if (current_duplex == half)
-+				data |= ADVERTISE_100HALF | ADVERTISE_10HALF;
-+			else
-+				data |= ADVERTISE_10HALF | ADVERTISE_10FULL |
-+				  ADVERTISE_100HALF | ADVERTISE_100FULL;
-+			break;
-+
-+		default: /* assume autoneg speed and duplex */
-+			data |= ADVERTISE_10HALF | ADVERTISE_10FULL |
-+				  ADVERTISE_100HALF | ADVERTISE_100FULL;
-+			break;
-+	}
-+
-+	e100_set_mdio_reg(dev, np->mii_if.phy_id, MII_ADVERTISE, data);
-+
-+	data = e100_get_mdio_reg(dev, np->mii_if.phy_id, MII_BMCR);
-+	if (autoneg_normal) {
-+		/* Renegotiate with link partner */
-+		data |= BMCR_ANENABLE | BMCR_ANRESTART;
-+	} else {
-+		/* Don't negotiate speed or duplex */
-+		data &= ~(BMCR_ANENABLE | BMCR_ANRESTART);
-+
-+		/* Set speed and duplex static */
-+		if (current_speed_selection == 10)
-+			data &= ~BMCR_SPEED100;
-+		else
-+			data |= BMCR_SPEED100;
-+
-+		if (current_duplex != full)
-+			data &= ~BMCR_FULLDPLX;
-+		else
-+			data |= BMCR_FULLDPLX;
-+	}
-+	e100_set_mdio_reg(dev, np->mii_if.phy_id, MII_BMCR, data);
-+}
-+
-+static void
-+e100_set_speed(struct net_device* dev, unsigned long speed)
-+{
-+	struct net_local *np = netdev_priv(dev);
-+
-+	spin_lock(&np->transceiver_lock);
-+	if (speed != current_speed_selection) {
-+		current_speed_selection = speed;
-+		e100_negotiate(dev);
-+	}
-+	spin_unlock(&np->transceiver_lock);
-+}
-+
-+static void
-+e100_check_duplex(unsigned long priv)
-+{
-+	struct net_device *dev = (struct net_device *)priv;
-+	struct net_local *np = netdev_priv(dev);
-+	int old_duplex;
-+
-+	spin_lock(&np->transceiver_lock);
-+	old_duplex = full_duplex;
-+	transceiver->check_duplex(dev);
-+	if (old_duplex != full_duplex) {
-+		/* Duplex changed */
-+		SETF(network_rec_config_shadow, R_NETWORK_REC_CONFIG, duplex, full_duplex);
-+		*R_NETWORK_REC_CONFIG = network_rec_config_shadow;
-+	}
-+
-+	/* Reinitialize the timer. */
-+	duplex_timer.expires = jiffies + NET_DUPLEX_CHE