Re: PATCH 2.3.99-7-3: "incompatible types in assignment" in scc.c and mkiss.c (more to go)

From: Nick Holloway (Nick.Holloway@alfie.demon.co.uk)
Date: Fri May 05 2000 - 02:21:18 EST

iafilius@xs4all.nl writes:
> To fix compiletime i had to do for scc.c and mkiss.c:

Another batch of missed drivers :-(

There is no need to allocate dev->name, as it is now a char array. A
better patch for scc.c is as follows:

Index: scc.c
===================================================================
RCS file: /usr/src/Repository/linux-2.3/drivers/net/hamradio/scc.c,v
retrieving revision 1.1.1.1
diff -b -u -u -r1.1.1.1 scc.c
--- scc.c 2000/04/08 18:36:16 1.1.1.1
+++ scc.c 2000/05/05 07:13:37
@@ -1554,7 +1554,6 @@
 
 static int scc_net_setup(struct scc_channel *scc, unsigned char *name, int addev)
 {
- unsigned char *buf;
         struct net_device *dev;
 
         if (dev_get(name))
@@ -1569,13 +1568,9 @@
         dev = scc->dev;
         memset(dev, 0, sizeof(struct net_device));
 
- if ((buf = (unsigned char *) kmalloc(10, GFP_KERNEL)) == NULL)
- return -ENOMEM;
-
- strcpy(buf, name);
 
         dev->priv = (void *) scc;
- dev->name = buf;
+ strcpy(dev->name, name);
         dev->init = scc_net_init;
 
         if ((addev? register_netdevice(dev) : register_netdev(dev)) != 0) 

-- 
 `O O'  | Nick.Holloway@pyrites.org.uk
// ^ \\ | http://www.pyrites.org.uk/

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/

This archive was generated by hypermail 2b29 : Sun May 07 2000 - 21:00:18 EST