patch-2.1.67 linux/drivers/net/slip.c

• Lines: 57
• Date: Sat Nov 29 10:33:20 1997
• Orig file: v2.1.66/linux/drivers/net/slip.c
• Orig date: Thu Sep 4 17:07:30 1997

diff -u --recursive --new-file v2.1.66/linux/drivers/net/slip.c linux/drivers/net/slip.c
@@ -589,12 +589,7 @@
 	sl->outfill_timer.data=(unsigned long)sl;
 	sl->outfill_timer.function=sl_outfill;
 #endif
-	/* Needed because address '0' is special */
-	if (dev->pa_addr == 0)  {
-		dev->pa_addr=ntohl(0xC0A80001);
-	}
 	dev->tbusy  = 0;
-/*	dev->flags |= IFF_UP; */
 	dev->start  = 1;
 
 	return 0;
@@ -626,8 +621,6 @@
 	dev->tbusy = 1;
 	dev->start = 0;
 
-/*	dev->flags &= ~IFF_UP; */
-
 	return 0;
 }
 
@@ -740,7 +733,11 @@
 		return;
 	}
 
-	(void) dev_close(sl->dev);
+	if (sl->dev->flags & IFF_UP)
+	{
+		/* STRONG layering violation! --ANK */
+		(void) dev_close(sl->dev);
+	}
 
 	tty->disc_data = 0;
 	sl->tty = NULL;
@@ -752,7 +749,6 @@
 		(void)del_timer (&sl->outfill_timer);
 #endif
 	sl_free(sl);
-	unregister_netdev(sl->dev);
 	MOD_DEC_USE_COUNT;
 }
 
@@ -1237,12 +1233,7 @@
 	dev_init_buffers(dev);
 	
 	/* New-style flags. */
-	dev->flags		= IFF_NOARP|IFF_MULTICAST;
-	dev->family		= AF_INET;
-	dev->pa_addr		= 0;
-	dev->pa_brdaddr	        = 0;
-	dev->pa_mask		= 0;
-	dev->pa_alen		= 4;
+	dev->flags		= IFF_NOARP|IFF_POINTOPOINT|IFF_MULTICAST;
 
 	return 0;
 }