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

Next file: linux/drivers/net/tunnel.c
Previous file: linux/drivers/net/slhc.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.59/linux/drivers/net/slip.c linux/drivers/net/slip.c
@@ -1022,7 +1022,7 @@
 	 case SIOCGIFNAME:
 		err = verify_area(VERIFY_WRITE, arg, strlen(sl->dev->name) + 1);
 		if (err)  {
-			return -err;
+			return err;
 		}
 		memcpy_tofs(arg, sl->dev->name, strlen(sl->dev->name) + 1);
 		return 0;
@@ -1030,7 +1030,7 @@
 	case SIOCGIFENCAP:
 		err = verify_area(VERIFY_WRITE, arg, sizeof(int));
 		if (err)  {
-			return -err;
+			return err;
 		}
 		put_user(sl->mode, (int *)arg);
 		return 0;
@@ -1038,7 +1038,7 @@
 	case SIOCSIFENCAP:
 		err = verify_area(VERIFY_READ, arg, sizeof(int));
 		if (err)  {
-			return -err;
+			return err;
 		}
 		tmp = get_user((int *)arg);
 #ifndef SL_INCLUDE_CSLIP
@@ -1205,6 +1205,7 @@
 	dev->hard_header_len	= 0;
 	dev->addr_len		= 0;
 	dev->type		= ARPHRD_SLIP + SL_MODE_DEFAULT;
+	dev->tx_queue_len	= 10;
 #ifdef CONFIG_AX25
 	if (sl->dev->type == 260) {
 		sl->dev->type = ARPHRD_AX25;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this