X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/0d15d1fe3ac822cd329492b1f9854c2c36fdc7ae..10b1167329d8ebb966e0ebc92e445f66fe30f02f:/target/linux/atheros/files/drivers/net/ar2313/ar2313.c?ds=inline

diff --git a/target/linux/atheros/files/drivers/net/ar2313/ar2313.c b/target/linux/atheros/files/drivers/net/ar2313/ar2313.c
index b6e2dcab3..985af024c 100644
--- a/target/linux/atheros/files/drivers/net/ar2313/ar2313.c
+++ b/target/linux/atheros/files/drivers/net/ar2313/ar2313.c
@@ -14,7 +14,7 @@
  * (at your option) any later version.
  *
  * Additional credits:
- * 	This code is taken from John Taylor's Sibyte driver and then 
+ * 	This code is taken from John Taylor's Sibyte driver and then
  * 	modified for the AR2313.
  */
 
@@ -134,7 +134,7 @@
 #define CRC_LEN                 4
 #define RX_OFFSET               2
 
-#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) 
+#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
 #define VLAN_HDR                4
 #else
 #define VLAN_HDR                0
@@ -186,10 +186,9 @@ int __init ar2313_probe(struct platform_device *pdev)
 		return -ENOMEM;
 	}
 
-	SET_MODULE_OWNER(dev);
 	platform_set_drvdata(pdev, dev);
 
-	sp = dev->priv;
+	sp = netdev_priv(dev);
 	sp->dev = dev;
 	sp->cfg = pdev->dev.platform_data;
 
@@ -212,7 +211,6 @@ int __init ar2313_probe(struct platform_device *pdev)
 	dev->stop = &ar2313_close;
 	dev->hard_start_xmit = &ar2313_start_xmit;
 
-	dev->get_stats = &ar2313_get_stats;
 	dev->set_multicast_list = &ar2313_multicast_list;
 #ifdef TX_TIMEOUT
 	dev->tx_timeout = ar2313_tx_timeout;
@@ -221,7 +219,7 @@ int __init ar2313_probe(struct platform_device *pdev)
 	dev->do_ioctl = &ar2313_ioctl;
 
 	// SAMEER: do we need this?
-	dev->features |= NETIF_F_SG | NETIF_F_HIGHDMA;
+	dev->features |= NETIF_F_HIGHDMA;
 
 	tasklet_init(&sp->rx_tasklet, rx_tasklet_func, (unsigned long) dev);
 	tasklet_disable(&sp->rx_tasklet);
@@ -233,8 +231,8 @@ int __init ar2313_probe(struct platform_device *pdev)
 		return (-ENXIO);
 	}
 
-	/* 
-	 * When there's only one MAC, PHY regs are typically on ENET0, 
+	/*
+	 * When there's only one MAC, PHY regs are typically on ENET0,
 	 * even though the MAC might be on ENET1.
 	 * Needto remap PHY regs separately in this case
 	 */
@@ -271,7 +269,7 @@ int __init ar2313_probe(struct platform_device *pdev)
 	sp->board_idx = BOARD_IDX_STATIC;
 
 	if (ar2313_init(dev)) {
-		/* 
+		/*
 		 * ar2313_init() calls ar2313_init_cleanup() on error.
 		 */
 		kfree(dev);
@@ -296,7 +294,7 @@ int __init ar2313_probe(struct platform_device *pdev)
 	sp->mii_bus.id = 0;
 	sp->mii_bus.irq = kmalloc(sizeof(int), GFP_KERNEL);
 	*sp->mii_bus.irq = PHY_POLL;
-	
+
 	mdiobus_register(&sp->mii_bus);
 
 	if (mdiobus_probe(dev) != 0) {
@@ -309,7 +307,7 @@ int __init ar2313_probe(struct platform_device *pdev)
 		/* start link poll timer */
 		ar2313_setup_timer(dev);
 	}
-	
+
 	return 0;
 }
 
@@ -317,7 +315,7 @@ int __init ar2313_probe(struct platform_device *pdev)
 static void ar2313_dump_regs(struct net_device *dev)
 {
 	unsigned int *ptr, i;
-	struct ar2313_private *sp = (struct ar2313_private *) dev->priv;
+	struct ar2313_private *sp = netdev_priv(dev);
 
 	ptr = (unsigned int *) sp->eth_regs;
 	for (i = 0; i < (sizeof(ETHERNET_STRUCT) / sizeof(unsigned int));
@@ -346,7 +344,7 @@ static void ar2313_dump_regs(struct net_device *dev)
 #ifdef TX_TIMEOUT
 static void ar2313_tx_timeout(struct net_device *dev)
 {
-	struct ar2313_private *sp = (struct ar2313_private *) dev->priv;
+	struct ar2313_private *sp = netdev_priv(dev);
 	unsigned long flags;
 
 #if DEBUG_TX
@@ -380,11 +378,11 @@ static void printMcList(struct net_device *dev)
  */
 static void ar2313_multicast_list(struct net_device *dev)
 {
-	/* 
-	 * Always listen to broadcasts and 
-	 * treat IFF bits independently 
+	/*
+	 * Always listen to broadcasts and
+	 * treat IFF bits independently
 	 */
-	struct ar2313_private *sp = (struct ar2313_private *) dev->priv;
+	struct ar2313_private *sp = netdev_priv(dev);
 	unsigned int recognise;
 
 	recognise = sp->eth_regs->mac_control;
@@ -419,9 +417,9 @@ static void ar2313_multicast_list(struct net_device *dev)
 
 static void rx_tasklet_cleanup(struct net_device *dev)
 {
-	struct ar2313_private *sp = dev->priv;
+	struct ar2313_private *sp = netdev_priv(dev);
 
-	/* 
+	/*
 	 * Tasklet may be scheduled. Need to get it removed from the list
 	 * since we're about to free the struct.
 	 */
@@ -443,7 +441,7 @@ static int __exit ar2313_remove(struct platform_device *pdev)
 
 
 /*
- * Restart the AR2313 ethernet controller. 
+ * Restart the AR2313 ethernet controller.
  */
 static int ar2313_restart(struct net_device *dev)
 {
@@ -484,7 +482,7 @@ module_exit(ar2313_module_cleanup);
 
 static void ar2313_free_descriptors(struct net_device *dev)
 {
-	struct ar2313_private *sp = dev->priv;
+	struct ar2313_private *sp = netdev_priv(dev);
 	if (sp->rx_ring != NULL) {
 		kfree((void *) KSEG0ADDR(sp->rx_ring));
 		sp->rx_ring = NULL;
@@ -495,7 +493,7 @@ static void ar2313_free_descriptors(struct net_device *dev)
 
 static int ar2313_allocate_descriptors(struct net_device *dev)
 {
-	struct ar2313_private *sp = dev->priv;
+	struct ar2313_private *sp = netdev_priv(dev);
 	int size;
 	int j;
 	ar2313_descr_t *space;
@@ -546,7 +544,7 @@ static int ar2313_allocate_descriptors(struct net_device *dev)
  */
 static void ar2313_init_cleanup(struct net_device *dev)
 {
-	struct ar2313_private *sp = dev->priv;
+	struct ar2313_private *sp = netdev_priv(dev);
 	struct sk_buff *skb;
 	int j;
 
@@ -584,7 +582,7 @@ static void ar2313_init_cleanup(struct net_device *dev)
 
 static int ar2313_setup_timer(struct net_device *dev)
 {
-	struct ar2313_private *sp = dev->priv;
+	struct ar2313_private *sp = netdev_priv(dev);
 
 	init_timer(&sp->link_timer);
 
@@ -600,14 +598,14 @@ static int ar2313_setup_timer(struct net_device *dev)
 static void ar2313_link_timer_fn(unsigned long data)
 {
 	struct net_device *dev = (struct net_device *) data;
-	struct ar2313_private *sp = dev->priv;
+	struct ar2313_private *sp = netdev_priv(dev);
 
 	// see if the link status changed
 	// This was needed to make sure we set the PHY to the
 	// autonegotiated value of half or full duplex.
 	ar2313_check_link(dev);
 
-	// Loop faster when we don't have link. 
+	// Loop faster when we don't have link.
 	// This was needed to speed up the AP bootstrap time.
 	if (sp->link == 0) {
 		mod_timer(&sp->link_timer, jiffies + HZ / 2);
@@ -618,7 +616,7 @@ static void ar2313_link_timer_fn(unsigned long data)
 
 static void ar2313_check_link(struct net_device *dev)
 {
-	struct ar2313_private *sp = dev->priv;
+	struct ar2313_private *sp = netdev_priv(dev);
 	u16 phyData;
 
 	phyData = mdiobus_read(&sp->mii_bus, sp->phy, MII_BMSR);
@@ -664,7 +662,7 @@ static void ar2313_check_link(struct net_device *dev)
 
 static int ar2313_reset_reg(struct net_device *dev)
 {
-	struct ar2313_private *sp = (struct ar2313_private *) dev->priv;
+	struct ar2313_private *sp = netdev_priv(dev);
 	unsigned int ethsal, ethsah;
 	unsigned int flags;
 
@@ -726,10 +724,10 @@ static int ar2313_reset_reg(struct net_device *dev)
 
 static int ar2313_init(struct net_device *dev)
 {
-	struct ar2313_private *sp = dev->priv;
+	struct ar2313_private *sp = netdev_priv(dev);
 	int ecode = 0;
 
-	/* 
+	/*
 	 * Allocate descriptors
 	 */
 	if (ar2313_allocate_descriptors(dev)) {
@@ -739,7 +737,7 @@ static int ar2313_init(struct net_device *dev)
 		goto init_error;
 	}
 
-	/* 
+	/*
 	 * Get the memory for the skb rings.
 	 */
 	if (sp->rx_skb == NULL) {
@@ -768,7 +766,7 @@ static int ar2313_init(struct net_device *dev)
 	}
 	memset(sp->tx_skb, 0, sizeof(struct sk_buff *) * AR2313_DESCR_ENTRIES);
 
-	/* 
+	/*
 	 * Set tx_csm before we start receiving interrupts, otherwise
 	 * the interrupt handler might think it is supposed to process
 	 * tx ints before we are up and running, which may cause a null
@@ -779,23 +777,23 @@ static int ar2313_init(struct net_device *dev)
 	sp->tx_prd = 0;
 	sp->tx_csm = 0;
 
-	/* 
+	/*
 	 * Zero the stats before starting the interface
 	 */
-	memset(&sp->stats, 0, sizeof(sp->stats));
+	memset(&dev->stats, 0, sizeof(dev->stats));
 
-	/* 
+	/*
 	 * We load the ring here as there seem to be no way to tell the
 	 * firmware to wipe the ring without re-initializing it.
 	 */
 	ar2313_load_rx_ring(dev, RX_RING_SIZE);
 
-	/* 
+	/*
 	 * Init hardware
 	 */
 	ar2313_reset_reg(dev);
 
-	/* 
+	/*
 	 * Get the IRQ
 	 */
 	ecode =
@@ -828,7 +826,7 @@ static int ar2313_init(struct net_device *dev)
 static void ar2313_load_rx_ring(struct net_device *dev, int nr_bufs)
 {
 
-	struct ar2313_private *sp = ((struct net_device *) dev)->priv;
+	struct ar2313_private *sp = netdev_priv(dev);
 	short i, idx;
 
 	idx = sp->rx_skbprd;
@@ -853,7 +851,7 @@ static void ar2313_load_rx_ring(struct net_device *dev, int nr_bufs)
 		// partha: create additional room in the front for tx pkt capture
 		skb_reserve(skb, 32);
 
-		/* 
+		/*
 		 * Make sure IP header starts on a fresh cache line.
 		 */
 		skb->dev = dev;
@@ -890,7 +888,7 @@ static void ar2313_load_rx_ring(struct net_device *dev, int nr_bufs)
 
 static int ar2313_rx_int(struct net_device *dev)
 {
-	struct ar2313_private *sp = dev->priv;
+	struct ar2313_private *sp = netdev_priv(dev);
 	struct sk_buff *skb, *skb_new;
 	ar2313_descr_t *rxdesc;
 	unsigned int status;
@@ -900,7 +898,7 @@ static int ar2313_rx_int(struct net_device *dev)
 
 	idx = sp->cur_rx;
 
-	/* process at most the entire ring and then wait for another interrupt 
+	/* process at most the entire ring and then wait for another interrupt
 	 */
 	while (1) {
 
@@ -929,20 +927,20 @@ static int ar2313_rx_int(struct net_device *dev)
 #if DEBUG_RX
 			printk("%s: rx ERROR %08x\n", __FUNCTION__, status);
 #endif
-			sp->stats.rx_errors++;
-			sp->stats.rx_dropped++;
+			dev->stats.rx_errors++;
+			dev->stats.rx_dropped++;
 
 			/* add statistics counters */
 			if (status & DMA_RX_ERR_CRC)
-				sp->stats.rx_crc_errors++;
+				dev->stats.rx_crc_errors++;
 			if (status & DMA_RX_ERR_COL)
-				sp->stats.rx_over_errors++;
+				dev->stats.rx_over_errors++;
 			if (status & DMA_RX_ERR_LENGTH)
-				sp->stats.rx_length_errors++;
+				dev->stats.rx_length_errors++;
 			if (status & DMA_RX_ERR_RUNT)
-				sp->stats.rx_over_errors++;
+				dev->stats.rx_over_errors++;
 			if (status & DMA_RX_ERR_DESC)
-				sp->stats.rx_over_errors++;
+				dev->stats.rx_over_errors++;
 
 		} else {
 			/* alloc new buffer. */
@@ -954,7 +952,7 @@ static int ar2313_rx_int(struct net_device *dev)
 				skb_put(skb,
 						((status >> DMA_RX_LEN_SHIFT) & 0x3fff) - CRC_LEN);
 
-				sp->stats.rx_bytes += skb->len;
+				dev->stats.rx_bytes += skb->len;
 				skb->protocol = eth_type_trans(skb, dev);
 				/* pass the packet to upper layers */
 				netif_rx(skb);
@@ -965,10 +963,10 @@ static int ar2313_rx_int(struct net_device *dev)
 				/* reset descriptor's curr_addr */
 				rxdesc->addr = virt_to_phys(skb_new->data);
 
-				sp->stats.rx_packets++;
+				dev->stats.rx_packets++;
 				sp->rx_skb[idx] = skb_new;
 			} else {
-				sp->stats.rx_dropped++;
+				dev->stats.rx_dropped++;
 			}
 		}
 
@@ -987,7 +985,7 @@ static int ar2313_rx_int(struct net_device *dev)
 
 static void ar2313_tx_int(struct net_device *dev)
 {
-	struct ar2313_private *sp = dev->priv;
+	struct ar2313_private *sp = netdev_priv(dev);
 	u32 idx;
 	struct sk_buff *skb;
 	ar2313_descr_t *txdesc;
@@ -1017,27 +1015,27 @@ static void ar2313_tx_int(struct net_device *dev)
 		txdesc->status = 0;
 
 		if (status & DMA_TX_ERROR) {
-			sp->stats.tx_errors++;
-			sp->stats.tx_dropped++;
+			dev->stats.tx_errors++;
+			dev->stats.tx_dropped++;
 			if (status & DMA_TX_ERR_UNDER)
-				sp->stats.tx_fifo_errors++;
+				dev->stats.tx_fifo_errors++;
 			if (status & DMA_TX_ERR_HB)
-				sp->stats.tx_heartbeat_errors++;
+				dev->stats.tx_heartbeat_errors++;
 			if (status & (DMA_TX_ERR_LOSS | DMA_TX_ERR_LINK))
-				sp->stats.tx_carrier_errors++;
+				dev->stats.tx_carrier_errors++;
 			if (status & (DMA_TX_ERR_LATE |
 						  DMA_TX_ERR_COL |
 						  DMA_TX_ERR_JABBER | DMA_TX_ERR_DEFER))
-				sp->stats.tx_aborted_errors++;
+				dev->stats.tx_aborted_errors++;
 		} else {
 			/* transmit OK */
-			sp->stats.tx_packets++;
+			dev->stats.tx_packets++;
 		}
 
 		skb = sp->tx_skb[idx];
 		sp->tx_skb[idx] = NULL;
 		idx = DSC_NEXT(idx);
-		sp->stats.tx_bytes += skb->len;
+		dev->stats.tx_bytes += skb->len;
 		dev_kfree_skb_irq(skb);
 	}
 
@@ -1050,7 +1048,7 @@ static void ar2313_tx_int(struct net_device *dev)
 static void rx_tasklet_func(unsigned long data)
 {
 	struct net_device *dev = (struct net_device *) data;
-	struct ar2313_private *sp = dev->priv;
+	struct ar2313_private *sp = netdev_priv(dev);
 
 	if (sp->unloading) {
 		return;
@@ -1068,7 +1066,7 @@ static void rx_tasklet_func(unsigned long data)
 
 static void rx_schedule(struct net_device *dev)
 {
-	struct ar2313_private *sp = dev->priv;
+	struct ar2313_private *sp = netdev_priv(dev);
 
 	sp->dma_regs->intr_ena &= ~DMA_STATUS_RI;
 
@@ -1078,11 +1076,11 @@ static void rx_schedule(struct net_device *dev)
 static irqreturn_t ar2313_interrupt(int irq, void *dev_id)
 {
 	struct net_device *dev = (struct net_device *) dev_id;
-	struct ar2313_private *sp = dev->priv;
+	struct ar2313_private *sp = netdev_priv(dev);
 	unsigned int status, enabled;
 
 	/* clear interrupt */
-	/* 
+	/*
 	 * Don't clear RI bit if currently disabled.
 	 */
 	status = sp->dma_regs->status;
@@ -1091,7 +1089,7 @@ static irqreturn_t ar2313_interrupt(int irq, void *dev_id)
 
 	if (status & DMA_STATUS_NIS) {
 		/* normal status */
-		/* 
+		/*
 		 * Don't schedule rx processing if interrupt
 		 * is already disabled.
 		 */
@@ -1121,9 +1119,7 @@ static irqreturn_t ar2313_interrupt(int irq, void *dev_id)
 
 static int ar2313_open(struct net_device *dev)
 {
-	struct ar2313_private *sp;
-
-	sp = dev->priv;
+	struct ar2313_private *sp = netdev_priv(dev);
 
 	dev->mtu = 1500;
 	netif_start_queue(dev);
@@ -1135,7 +1131,7 @@ static int ar2313_open(struct net_device *dev)
 
 static void ar2313_halt(struct net_device *dev)
 {
-	struct ar2313_private *sp = dev->priv;
+	struct ar2313_private *sp = netdev_priv(dev);
 	int j;
 
 	tasklet_disable(&sp->rx_tasklet);
@@ -1179,12 +1175,12 @@ static void ar2313_halt(struct net_device *dev)
 static int ar2313_close(struct net_device *dev)
 {
 #if 0
-	/* 
+	/*
 	 * Disable interrupts
 	 */
 	disable_irq(dev->irq);
 
-	/* 
+	/*
 	 * Without (or before) releasing irq and stopping hardware, this
 	 * is an absolute non-sense, by the way. It will be reset instantly
 	 * by the first irq.
@@ -1203,7 +1199,7 @@ static int ar2313_close(struct net_device *dev)
 
 static int ar2313_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
-	struct ar2313_private *sp = dev->priv;
+	struct ar2313_private *sp = netdev_priv(dev);
 	ar2313_descr_t *td;
 	u32 idx;
 
@@ -1215,7 +1211,7 @@ static int ar2313_start_xmit(struct sk_buff *skb, struct net_device *dev)
 		printk("%s: No space left to Tx\n", __FUNCTION__);
 #endif
 		/* free skbuf and lie to the caller that we sent it out */
-		sp->stats.tx_dropped++;
+		dev->stats.tx_dropped++;
 		dev_kfree_skb(skb);
 
 		/* restart transmitter in case locked */
@@ -1250,9 +1246,9 @@ static int ar2313_start_xmit(struct sk_buff *skb, struct net_device *dev)
 static int ar2313_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
 	struct mii_ioctl_data *data = (struct mii_ioctl_data *) &ifr->ifr_data;
-	struct ar2313_private *sp = dev->priv;
+	struct ar2313_private *sp = netdev_priv(dev);
 	int ret;
-	
+
 	switch (cmd) {
 
 	case SIOCETHTOOL:
@@ -1272,12 +1268,12 @@ static int ar2313_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 			(ifr->ifr_data, dev->dev_addr, sizeof(dev->dev_addr)))
 			return -EFAULT;
 		return 0;
-	
+
 	case SIOCGMIIPHY:
 	case SIOCGMIIREG:
 	case SIOCSMIIREG:
 		return phy_mii_ioctl(sp->phy_dev, data, cmd);
-	
+
 	default:
 		break;
 	}
@@ -1285,26 +1281,34 @@ static int ar2313_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 	return -EOPNOTSUPP;
 }
 
-static struct net_device_stats *ar2313_get_stats(struct net_device *dev)
+static void ar2313_adjust_link(struct net_device *dev)
 {
-	struct ar2313_private *sp = dev->priv;
-	return &sp->stats;
-}
+	struct ar2313_private *sp = netdev_priv(dev);
+	unsigned int mc;
 
+	if (!sp->phy_dev->link)
+		return;
 
-static void ar2313_adjust_link(struct net_device *dev)
-{
-	printk(KERN_ERR " ar2313_adjust_link implementation missing\n");
+	if (sp->phy_dev->duplex != sp->oldduplex) {
+		mc = readl(&sp->eth_regs->mac_control);
+		mc &= ~(MAC_CONTROL_F | MAC_CONTROL_DRO);
+		if (sp->phy_dev->duplex)
+			mc |= MAC_CONTROL_F;
+		else
+			mc |= MAC_CONTROL_DRO;
+		writel(mc, &sp->eth_regs->mac_control);
+		sp->oldduplex = sp->phy_dev->duplex;
+	}
 }
 
 #define MII_ADDR(phy, reg) \
 	((reg << MII_ADDR_REG_SHIFT) | (phy << MII_ADDR_PHY_SHIFT))
 
-static int 
+static int
 mdiobus_read(struct mii_bus *bus, int phy_addr, int regnum)
 {
 	struct net_device *const dev = bus->priv;
-	struct ar2313_private *sp = (struct ar2313_private *) dev->priv;
+	struct ar2313_private *sp = netdev_priv(dev);
 	volatile ETHERNET_STRUCT *ethernet = sp->phy_regs;
 
 	ethernet->mii_addr = MII_ADDR(phy_addr, regnum);
@@ -1312,12 +1316,12 @@ mdiobus_read(struct mii_bus *bus, int phy_addr, int regnum)
 	return (ethernet->mii_data >> MII_DATA_SHIFT);
 }
 
-static int 
+static int
 mdiobus_write(struct mii_bus *bus, int phy_addr, int regnum,
              u16 value)
 {
 	struct net_device *const dev = bus->priv;
-	struct ar2313_private *sp = (struct ar2313_private *) dev->priv;
+	struct ar2313_private *sp = netdev_priv(dev);
 	volatile ETHERNET_STRUCT *ethernet = sp->phy_regs;
 
 	while (ethernet->mii_addr & MII_ADDR_BUSY);
@@ -1332,13 +1336,13 @@ static int mdiobus_reset(struct mii_bus *bus)
 	struct net_device *const dev = bus->priv;
 
 	ar2313_reset_reg(dev);
-	
+
 	return 0;
 }
 
 static int mdiobus_probe (struct net_device *dev)
 {
-	struct ar2313_private *const sp = (struct ar2313_private *) dev->priv;
+	struct ar2313_private *const sp = netdev_priv(dev);
 	struct phy_device *phydev = NULL;
 	int phy_addr;
 
@@ -1348,19 +1352,19 @@ static int mdiobus_probe (struct net_device *dev)
 			phydev = sp->mii_bus.phy_map[phy_addr];
 			break; /* break out with first one found */
 		}
-	
+
 	if (!phydev) {
 		printk (KERN_ERR "ar2313:%s: no PHY found\n", dev->name);
 		return -1;
 	}
-	
+
 	/* now we are supposed to have a proper phydev, to attach to... */
 	BUG_ON(!phydev);
 	BUG_ON(phydev->attached_dev);
-	
+
 	phydev = phy_connect(dev, phydev->dev.bus_id, &ar2313_adjust_link, 0,
 		PHY_INTERFACE_MODE_MII);
-	
+
 	if (IS_ERR(phydev)) {
 		printk(KERN_ERR "%s: Could not attach to PHY\n", dev->name);
 		return PTR_ERR(phydev);
@@ -1375,18 +1379,16 @@ static int mdiobus_probe (struct net_device *dev)
 		/* | SUPPORTED_Pause | SUPPORTED_Asym_Pause */
 		| SUPPORTED_MII
 		| SUPPORTED_TP);
-	
+
 	phydev->advertising = phydev->supported;
-	
-	//sp->old_link = 0;
-	//sp->old_speed = 0;
-	//sp->old_duplex = -1;
+
+	sp->oldduplex = -1;
 	sp->phy_dev = phydev;
-	
+
 	printk(KERN_INFO "%s: attached PHY driver [%s] "
 		"(mii_bus:phy_addr=%s)\n",
 		dev->name, phydev->drv->name, phydev->dev.bus_id);
-	
+
 	return 0;
 }