X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fnet%2Fwireless%2Fstrip.c;h=45a26d94aa4064af50ec1c37d1e3fbab1b3a1fc3;hb=5e3b93f248c98873cc843e83092bb8da92ac85a2;hp=98cee21f7d84a1110d91094a165983908fd2f446;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git

diff --git a/drivers/net/wireless/strip.c b/drivers/net/wireless/strip.c
index 98cee21f7..45a26d94a 100644
--- a/drivers/net/wireless/strip.c
+++ b/drivers/net/wireless/strip.c
@@ -409,12 +409,12 @@ static const MetricomAddress zero_address;
 static const MetricomAddress broadcast_address =
     { {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF} };
 
-static const MetricomKey SIP0Key = { "SIP0" };
-static const MetricomKey ARP0Key = { "ARP0" };
-static const MetricomKey ATR_Key = { "ATR " };
-static const MetricomKey ACK_Key = { "ACK_" };
-static const MetricomKey INF_Key = { "INF_" };
-static const MetricomKey ERR_Key = { "ERR_" };
+static const MetricomKey SIP0Key = { {"SIP0"} };
+static const MetricomKey ARP0Key = { {"ARP0"} };
+static const MetricomKey ATR_Key = { {"ATR "} };
+static const MetricomKey ACK_Key = { {"ACK_"} };
+static const MetricomKey INF_Key = { {"INF_"} };
+static const MetricomKey ERR_Key = { {"ERR_"} };
 
 static const long MaxARPInterval = 60 * HZ;	/* One minute */
 
@@ -2707,7 +2707,7 @@ static void strip_close(struct tty_struct *tty)
 
 	unregister_netdev(strip_info->dev);
 
-	tty->disc_data = NULL;
+	tty->disc_data = 0;
 	strip_info->tty = NULL;
 	printk(KERN_INFO "STRIP: device \"%s\" closed down\n",
 	       strip_info->dev->name);
@@ -2733,14 +2733,14 @@ static int strip_ioctl(struct tty_struct *tty, struct file *file,
 
 	switch (cmd) {
 	case SIOCGIFNAME:
-		if(copy_to_user((void __user *) arg, strip_info->dev->name, strlen(strip_info->dev->name) + 1))
+		if(copy_to_user((void *) arg, strip_info->dev->name, strlen(strip_info->dev->name) + 1))
 			return -EFAULT;
 		break;
 	case SIOCSIFHWADDR:
 	{
 		MetricomAddress addr;
 		//printk(KERN_INFO "%s: SIOCSIFHWADDR\n", strip_info->dev->name);
-		if(copy_from_user(&addr, (void __user *) arg, sizeof(MetricomAddress)))
+		if(copy_from_user(&addr, (void *) arg, sizeof(MetricomAddress)))
 			return -EFAULT;
 		return set_mac_address(strip_info, &addr);
 	}
@@ -2750,7 +2750,7 @@ static int strip_ioctl(struct tty_struct *tty, struct file *file,
 
 	case TCGETS:
 	case TCGETA:
-		return n_tty_ioctl(tty, file, cmd, arg);
+		return n_tty_ioctl(tty, (struct file *) file, cmd, (unsigned long) arg);
 		break;
 	default:
 		return -ENOIOCTLCMD;