patch-2.1.4 linux/drivers/net/eql.c

• Lines: 63
• Date: Sun Oct 13 21:11:13 1996
• Orig file: v2.1.3/linux/drivers/net/eql.c
• Orig date: Sun Sep 22 21:17:21 1996

diff -u --recursive --new-file v2.1.3/linux/drivers/net/eql.c linux/drivers/net/eql.c
@@ -447,7 +447,7 @@
 #endif  
 		return err;
 	  }
-	memcpy_fromfs (&srq, srqp, sizeof (slaving_request_t));
+	copy_from_user (&srq, srqp, sizeof (slaving_request_t));
 
 #ifdef EQL_DEBUG
 	if (eql_debug >= 20)
@@ -504,7 +504,7 @@
 	if (err) 
 		return err;
 
-	memcpy_fromfs (&srq, srqp, sizeof (slaving_request_t));
+	copy_from_user (&srq, srqp, sizeof (slaving_request_t));
 #ifdef EQL_DEBUG
 	if (eql_debug >= 20)
 		printk ("%s: emancipate `%s`\n", dev->name, srq.slave_name);
@@ -535,7 +535,7 @@
 	if (err) 
 		return err;
 
-	memcpy_fromfs (&sc, scp, sizeof (slave_config_t));
+	copy_from_user (&sc, scp, sizeof (slave_config_t));
 #ifdef EQL_DEBUG
 	if (eql_debug >= 20)
 		printk ("%s: get config for slave `%s'\n", dev->name, sc.slave_name);
@@ -552,7 +552,7 @@
 			err = verify_area(VERIFY_WRITE, (void *)scp, sizeof (slave_config_t));
 			if (err) 
 				return err;
-			memcpy_tofs (scp, &sc, sizeof (slave_config_t));
+			copy_to_user (scp, &sc, sizeof (slave_config_t));
 			return 0;
 		}
 	}
@@ -577,7 +577,7 @@
 		printk ("%s: set config for slave `%s'\n", dev->name, sc.slave_name);
 #endif
   
-	memcpy_fromfs (&sc, scp, sizeof (slave_config_t));
+	copy_from_user (&sc, scp, sizeof (slave_config_t));
 
 	eql = (equalizer_t *) dev->priv;
 	slave_dev = dev_get (sc.slave_name);
@@ -616,7 +616,7 @@
 		eql = (equalizer_t *) dev->priv;
 		mc.max_slaves = eql->max_slaves;
 		mc.min_slaves = eql->min_slaves;
-		memcpy_tofs (mcp, &mc, sizeof (master_config_t));
+		copy_to_user (mcp, &mc, sizeof (master_config_t));
 		return 0;
 	}
 	return -EINVAL;
@@ -636,7 +636,7 @@
 	if (eql_debug >= 20)
 		printk ("%s: set master config\n", dev->name);
 #endif
-	memcpy_fromfs (&mc, mcp, sizeof (master_config_t));
+	copy_from_user (&mc, mcp, sizeof (master_config_t));
 	if ( eql_is_master (dev) )
 	{
 		eql = (equalizer_t *) dev->priv;