--- linux-2.6.0-test8/drivers/net/tulip/de2104x.c-orig	Tue Nov 25 13:20:25 2003
+++ linux-2.6.0-test8/drivers/net/tulip/de2104x.c	Tue Nov 25 13:20:25 2003
@@ -1384,7 +1384,6 @@ static int de_open (struct net_device *d
 {
 	struct de_private *de = dev->priv;
 	int rc;
-	unsigned long flags;
 
 	if (netif_msg_ifup(de))
 		printk(KERN_DEBUG "%s: enabling interface\n", dev->name);
@@ -1601,7 +1600,7 @@ static int __de_set_settings(struct de_p
 	    (ecmd->advertising == de->media_advertise))
 		return 0; /* nothing to change */
 	    
-	if (netif_running(dev)) {
+	if (netif_running(de->dev)) {
 		de_link_down(de);
 		de_stop_rxtx(de);
 	}
@@ -1610,7 +1609,7 @@ static int __de_set_settings(struct de_p
 	de->media_lock = media_lock;
 	de->media_advertise = ecmd->advertising;
 
-	if (netif_running(dev))
+	if (netif_running(de->dev))
 		de_set_media(de);
 	
 	return 0;