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

• Lines: 24
• Date: Sun Oct 13 21:11:14 1996
• Orig file: v2.1.3/linux/drivers/net/wic.c
• Orig date: Tue Jul 2 19:08:42 1996

diff -u --recursive --new-file v2.1.3/linux/drivers/net/wic.c linux/drivers/net/wic.c
@@ -1099,12 +1099,12 @@
 	err=verify_area(VERIFY_WRITE, rq->ifr_data, sizeof(struct wicconf));
 	if (err)
 		return err;
-	memcpy_fromfs(&wc, rq->ifr_data, sizeof(struct wicconf));
+	copy_from_user(&wc, rq->ifr_data, sizeof(struct wicconf));
 	switch(wc.pcmd) {
 		case WIC_AYT:
 			strcpy(wc.data, version);
 			wc.len = strlen(wc.data);
-			memcpy_tofs(rq->ifr_data, &wc, sizeof(struct wicconf));
+			copy_to_user(rq->ifr_data, &wc, sizeof(struct wicconf));
 			/* return 0; */
 			break;
 		case WIC_RESET:
@@ -1162,7 +1162,7 @@
 		outb(save, PAR_CONTROL(dev));
 		enable_irq(dev->irq);
 		wc.len = (len <0) ? 0 : len;
-		memcpy_tofs(rq->ifr_data, &wc, sizeof(struct wicconf));
+		copy_to_user(rq->ifr_data, &wc, sizeof(struct wicconf));
 	} else {
 		save |= 0x10; /* enable */
 		outb(save, PAR_CONTROL(dev));