--- linux-2.6.0/drivers/net/hamradio/scc.c 2003-12-18 03:59:27.000000000 +0100 +++ linux-2.6.0.rxq/drivers/net/hamradio/scc.c 2003-12-25 17:57:58.000000000 +0100 @@ -163,6 +163,7 @@ #include #include #include +#include #include #include #include @@ -1526,7 +1527,7 @@ scc->dev = dev; spin_lock_init(&scc->lock); - err = register_netdev(dev); + err = register_netdevice(dev); if (err) { printk(KERN_ERR "%s: can't register network device (%d)\n", name, err); @@ -2119,10 +2120,13 @@ sprintf(devname,"%s0", SCC_DriverName); + rtnl_lock(); if (scc_net_alloc(devname, SCC_Info)) { + rtnl_unlock(); printk(KERN_ERR "z8530drv: cannot initialize module\n"); return -EIO; } + rtnl_unlock(); proc_net_fops_create("z8530drv", 0, &scc_net_seq_fops);