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

• Lines: 25
• Date: Tue Mar 10 09:47:26 1998
• Orig file: v2.1.89/linux/drivers/net/slip.c
• Orig date: Tue Mar 10 10:03:32 1998

diff -u --recursive --new-file v2.1.89/linux/drivers/net/slip.c linux/drivers/net/slip.c
@@ -181,12 +181,14 @@
 	sl->xleft    = 0;
 	rbuff = xchg(&sl->rbuff, rbuff);
 	xbuff = xchg(&sl->xbuff, xbuff);
-#ifdef CONFIG_SLIP_MODE_SLIP6
+#ifdef SL_INCLUDE_CSLIP
 	cbuff = xchg(&sl->cbuff, cbuff);
 	slcomp = xchg(&sl->slcomp, slcomp);
+#ifdef CONFIG_SLIP_MODE_SLIP6
 	sl->xdata    = 0;
 	sl->xbits    = 0;
 #endif
+#endif
 	end_bh_atomic();
 	err = 0;
 
@@ -1134,7 +1136,7 @@
 		   it breaks my old poor gcc on alpha --ANK
 		 */
 		tmp = strlen(sl->dev->name) + 1;
-		if (copy_to_user(arg, sl->dev->name, tmp) < 0)
+		if (copy_to_user(arg, sl->dev->name, tmp))
 			return -EFAULT;
 		return 0;