Skip to content

L
linux
Commit eb8a710d authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Jeff Garzik
Browse files
Options

[PATCH] (1/4) Update baycom drivers for 2.6 

Update baycom drivers for 2.6.0-test5
	- get rid of MOD_INC/DEC
	    (looked into hdlcdrv_ops and don't need to have owner field because
	     baycom drivers unregister on  unload).
	- use alloc_netdev instead of static device structures.
	- hdlcdrv_register returns device instead of getting passed one.
	- put private data in space allocated at dev->priv in alloc_netdev
	- shorten name of hdlcdrv_register_hdlcdrv to hdlcdrv_register

I don't have actual baycom hardware, but driver builds and loads/unloads.
Real hardware initialization doesn't happen until open.

The first one is the important patch, the other three are just code review
type cleanups.
parent 49e68be0
Show whitespace changes
Inline Side-by-side
Showing with 140 additions and 173 deletions
drivers/net/hamradio/baycom_epp.c
View file @ eb8a710d
...@@ -98,7 +98,7 @@ KERN_INFO "baycom_epp: version 0.7 compiled " __TIME__ " " __DATE__ "\n"; ...@@ -98,7 +98,7 @@ KERN_INFO "baycom_epp: version 0.7 compiled " __TIME__ " " __DATE__ "\n";
#define NR_PORTS 4 #define NR_PORTS 4
static struct net_device baycom_device[NR_PORTS]; static struct net_device *baycom_device[NR_PORTS];
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
...@@ -1084,7 +1084,6 @@ static int epp_open(struct net_device *dev) ...@@ -1084,7 +1084,6 @@ static int epp_open(struct net_device *dev)
/* start the bottom half stuff */ /* start the bottom half stuff */
schedule_delayed_work(&bc->run_work, 1); schedule_delayed_work(&bc->run_work, 1);
netif_start_queue(dev); netif_start_queue(dev);
MOD_INC_USE_COUNT;
return 0; return 0;
epptimeout: epptimeout:
...@@ -1119,7 +1118,6 @@ static int epp_close(struct net_device *dev) ...@@ -1119,7 +1118,6 @@ static int epp_close(struct net_device *dev)
bc->skb = NULL; bc->skb = NULL;
printk(KERN_INFO "%s: close epp at iobase 0x%lx irq %u\n", printk(KERN_INFO "%s: close epp at iobase 0x%lx irq %u\n",
bc_drvname, dev->base_addr, dev->irq); bc_drvname, dev->base_addr, dev->irq);
MOD_DEC_USE_COUNT;
return 0; return 0;
} }
...@@ -1357,69 +1355,76 @@ MODULE_LICENSE("GPL"); ...@@ -1357,69 +1355,76 @@ MODULE_LICENSE("GPL");
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
static void __init baycom_epp_setup(struct net_device *dev)
{
struct baycom_state *bc = dev->priv;
/*
* initialize part of the baycom_state struct
*/
bc->magic = BAYCOM_MAGIC;
bc->cfg.fclk = 19666600;
bc->cfg.bps = 9600;
/*
* initialize part of the device struct
*/
dev->init = baycom_probe;
}
static int __init init_baycomepp(void) static int __init init_baycomepp(void)
{ {
struct net_device *dev;
int i, found = 0; int i, found = 0;
char set_hw = 1; char set_hw = 1;
struct baycom_state *bc;
printk(bc_drvinfo); printk(bc_drvinfo);
/* /*
* register net devices * register net devices
*/ */
for (i = 0; i < NR_PORTS; i++) { for (i = 0; i < NR_PORTS; i++) {
dev = baycom_device+i; struct net_device *dev;
dev = alloc_netdev(sizeof(struct baycom_state), "bce%d",
baycom_epp_setup);
if (!dev) {
printk(KERN_WARNING "bce%d : out of memory\n", i);
return found ? 0 : -ENOMEM;
}
sprintf(dev->name, "bce%d", i);
dev->base_addr = iobase[i];
if (!mode[i]) if (!mode[i])
set_hw = 0; set_hw = 0;
if (!set_hw) if (!set_hw)
iobase[i] = 0; iobase[i] = 0;
memset(dev, 0, sizeof(struct net_device));
if (!(bc = dev->priv = kmalloc(sizeof(struct baycom_state), GFP_KERNEL)))
return -ENOMEM;
/*
* initialize part of the baycom_state struct
*/
memset(bc, 0, sizeof(struct baycom_state));
bc->magic = BAYCOM_MAGIC;
sprintf(dev->name, "bce%d", i);
bc->cfg.fclk = 19666600;
bc->cfg.bps = 9600;
/*
* initialize part of the device struct
*/
dev->if_port = 0;
dev->init = baycom_probe;
dev->base_addr = iobase[i];
dev->irq = 0;
dev->dma = 0;
if (register_netdev(dev)) { if (register_netdev(dev)) {
printk(KERN_WARNING "%s: cannot register net device %s\n", bc_drvname, dev->name); printk(KERN_WARNING "%s: cannot register net device %s\n", bc_drvname, dev->name);
kfree(dev->priv); kfree(dev);
return -ENXIO; break;
} }
if (set_hw && baycom_setmode(bc, mode[i])) if (set_hw && baycom_setmode(dev->priv, mode[i]))
set_hw = 0; set_hw = 0;
baycom_device[i] = dev;
found++; found++;
} }
if (!found)
return -ENXIO; return found ? 0 : -ENXIO;
return 0;
} }
static void __exit cleanup_baycomepp(void) static void __exit cleanup_baycomepp(void)
{ {
struct net_device *dev;
struct baycom_state *bc;
int i; int i;
for(i = 0; i < NR_PORTS; i++) { for(i = 0; i < NR_PORTS; i++) {
dev = baycom_device+i; struct net_device *dev = baycom_device[i];
bc = (struct baycom_state *)dev->priv;
if (bc) { if (dev) {
struct baycom_state *bc = dev->priv;
if (bc->magic == BAYCOM_MAGIC) { if (bc->magic == BAYCOM_MAGIC) {
unregister_netdev(dev); unregister_netdev(dev);
kfree(dev->priv); free_netdev(dev);
} else } else
printk(paranoia_str, "cleanup_module"); printk(paranoia_str, "cleanup_module");
} }
......
drivers/net/hamradio/baycom_par.c
View file @ eb8a710d
...@@ -107,7 +107,7 @@ KERN_INFO "baycom_par: version 0.9 compiled " __TIME__ " " __DATE__ "\n"; ...@@ -107,7 +107,7 @@ KERN_INFO "baycom_par: version 0.9 compiled " __TIME__ " " __DATE__ "\n";
#define NR_PORTS 4 #define NR_PORTS 4
static struct net_device baycom_device[NR_PORTS]; static struct net_device *baycom_device[NR_PORTS];
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
...@@ -352,7 +352,6 @@ static int par96_open(struct net_device *dev) ...@@ -352,7 +352,6 @@ static int par96_open(struct net_device *dev)
pp->ops->enable_irq(pp); pp->ops->enable_irq(pp);
printk(KERN_INFO "%s: par96 at iobase 0x%lx irq %u options 0x%x\n", printk(KERN_INFO "%s: par96 at iobase 0x%lx irq %u options 0x%x\n",
bc_drvname, dev->base_addr, dev->irq, bc->options); bc_drvname, dev->base_addr, dev->irq, bc->options);
MOD_INC_USE_COUNT;
return 0; return 0;
} }
...@@ -374,7 +373,6 @@ static int par96_close(struct net_device *dev) ...@@ -374,7 +373,6 @@ static int par96_close(struct net_device *dev)
parport_unregister_device(bc->pdev); parport_unregister_device(bc->pdev);
printk(KERN_INFO "%s: close par96 at iobase 0x%lx irq %u\n", printk(KERN_INFO "%s: close par96 at iobase 0x%lx irq %u\n",
bc_drvname, dev->base_addr, dev->irq); bc_drvname, dev->base_addr, dev->irq);
MOD_DEC_USE_COUNT;
return 0; return 0;
} }
...@@ -498,35 +496,38 @@ MODULE_LICENSE("GPL"); ...@@ -498,35 +496,38 @@ MODULE_LICENSE("GPL");
static int __init init_baycompar(void) static int __init init_baycompar(void)
{ {
int i, j, found = 0; int i, found = 0;
char set_hw = 1; char set_hw = 1;
struct baycom_state *bc;
printk(bc_drvinfo); printk(bc_drvinfo);
/* /*
* register net devices * register net devices
*/ */
for (i = 0; i < NR_PORTS; i++) { for (i = 0; i < NR_PORTS; i++) {
struct net_device *dev = baycom_device+i; struct net_device *dev;
struct baycom_state *bc;
char ifname[IFNAMSIZ]; char ifname[IFNAMSIZ];
sprintf(ifname, "bcp%d", i); sprintf(ifname, "bcp%d", i);
if (!mode[i]) if (!mode[i])
set_hw = 0; set_hw = 0;
if (!set_hw) if (!set_hw)
iobase[i] = 0; iobase[i] = 0;
j = hdlcdrv_register_hdlcdrv(dev, &par96_ops, sizeof(struct baycom_state),
dev = hdlcdrv_register(&par96_ops,
sizeof(struct baycom_state),
ifname, iobase[i], 0, 0); ifname, iobase[i], 0, 0);
if (!j) { if (IS_ERR(dev))
break;
bc = (struct baycom_state *)dev->priv; bc = (struct baycom_state *)dev->priv;
if (set_hw && baycom_setmode(bc, mode[i])) if (set_hw && baycom_setmode(bc, mode[i]))
set_hw = 0; set_hw = 0;
found++; found++;
} else { baycom_device[i] = dev;
printk(KERN_WARNING "%s: cannot register net device\n",
bc_drvname);
}
} }
if (!found) if (!found)
return -ENXIO; return -ENXIO;
return 0; return 0;
...@@ -537,16 +538,10 @@ static void __exit cleanup_baycompar(void) ...@@ -537,16 +538,10 @@ static void __exit cleanup_baycompar(void)
int i; int i;
for(i = 0; i < NR_PORTS; i++) { for(i = 0; i < NR_PORTS; i++) {
struct net_device *dev = baycom_device+i; struct net_device *dev = baycom_device[i];
struct baycom_state *bc = (struct baycom_state *)dev->priv;
if (bc) { if (dev)
if (bc->hdrv.magic != HDLCDRV_MAGIC) hdlcdrv_unregister(dev);
printk(KERN_ERR "baycom: invalid magic in "
"cleanup_module\n");
else
hdlcdrv_unregister_hdlcdrv(dev);
}
} }
} }
......
drivers/net/hamradio/baycom_ser_fdx.c
View file @ eb8a710d
...@@ -94,7 +94,7 @@ KERN_INFO "baycom_ser_fdx: version 0.10 compiled " __TIME__ " " __DATE__ "\n"; ...@@ -94,7 +94,7 @@ KERN_INFO "baycom_ser_fdx: version 0.10 compiled " __TIME__ " " __DATE__ "\n";
#define NR_PORTS 4 #define NR_PORTS 4
static struct net_device baycom_device[NR_PORTS]; static struct net_device *baycom_device[NR_PORTS];
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
...@@ -459,7 +459,6 @@ static int ser12_open(struct net_device *dev) ...@@ -459,7 +459,6 @@ static int ser12_open(struct net_device *dev)
hdlcdrv_setdcd(&bc->hdrv, 0); hdlcdrv_setdcd(&bc->hdrv, 0);
printk(KERN_INFO "%s: ser_fdx at iobase 0x%lx irq %u baud %u uart %s\n", printk(KERN_INFO "%s: ser_fdx at iobase 0x%lx irq %u baud %u uart %s\n",
bc_drvname, dev->base_addr, dev->irq, bc->baud, uart_str[u]); bc_drvname, dev->base_addr, dev->irq, bc->baud, uart_str[u]);
MOD_INC_USE_COUNT;
return 0; return 0;
} }
...@@ -480,7 +479,6 @@ static int ser12_close(struct net_device *dev) ...@@ -480,7 +479,6 @@ static int ser12_close(struct net_device *dev)
release_region(dev->base_addr, SER12_EXTENT); release_region(dev->base_addr, SER12_EXTENT);
printk(KERN_INFO "%s: close ser_fdx at iobase 0x%lx irq %u\n", printk(KERN_INFO "%s: close ser_fdx at iobase 0x%lx irq %u\n",
bc_drvname, dev->base_addr, dev->irq); bc_drvname, dev->base_addr, dev->irq);
MOD_DEC_USE_COUNT;
return 0; return 0;
} }
...@@ -621,36 +619,39 @@ MODULE_LICENSE("GPL"); ...@@ -621,36 +619,39 @@ MODULE_LICENSE("GPL");
static int __init init_baycomserfdx(void) static int __init init_baycomserfdx(void)
{ {
int i, j, found = 0; int i, found = 0;
char set_hw = 1; char set_hw = 1;
struct baycom_state *bc;
printk(bc_drvinfo); printk(bc_drvinfo);
/* /*
* register net devices * register net devices
*/ */
for (i = 0; i < NR_PORTS; i++) { for (i = 0; i < NR_PORTS; i++) {
struct net_device *dev = baycom_device+i; struct net_device *dev;
struct baycom_state *bc;
char ifname[IFNAMSIZ]; char ifname[IFNAMSIZ];
sprintf(ifname, "bcsf%d", i); sprintf(ifname, "bcsf%d", i);
if (!mode[i]) if (!mode[i])
set_hw = 0; set_hw = 0;
if (!set_hw) if (!set_hw)
iobase[i] = irq[i] = 0; iobase[i] = irq[i] = 0;
j = hdlcdrv_register_hdlcdrv(dev, &ser12_ops, sizeof(struct baycom_state),
dev = hdlcdrv_register(&ser12_ops,
sizeof(struct baycom_state),
ifname, iobase[i], irq[i], 0); ifname, iobase[i], irq[i], 0);
if (!j) { if (IS_ERR(dev))
break;
bc = (struct baycom_state *)dev->priv; bc = (struct baycom_state *)dev->priv;
if (set_hw && baycom_setmode(bc, mode[i])) if (set_hw && baycom_setmode(bc, mode[i]))
set_hw = 0; set_hw = 0;
bc->baud = baud[i]; bc->baud = baud[i];
found++; found++;
} else { baycom_device[i] = dev;
printk(KERN_WARNING "%s: cannot register net device\n",
bc_drvname);
}
} }
if (!found) if (!found)
return -ENXIO; return -ENXIO;
return 0; return 0;
...@@ -661,16 +662,9 @@ static void __exit cleanup_baycomserfdx(void) ...@@ -661,16 +662,9 @@ static void __exit cleanup_baycomserfdx(void)
int i; int i;
for(i = 0; i < NR_PORTS; i++) { for(i = 0; i < NR_PORTS; i++) {
struct net_device *dev = baycom_device+i; struct net_device *dev = baycom_device[i];
struct baycom_state *bc = (struct baycom_state *)dev->priv; if (dev)
hdlcdrv_unregister(dev);
if (bc) {
if (bc->hdrv.magic != HDLCDRV_MAGIC)
printk(KERN_ERR "baycom: invalid magic in "
"cleanup_module\n");
else
hdlcdrv_unregister_hdlcdrv(dev);
}
} }
} }
......
drivers/net/hamradio/baycom_ser_hdx.c
View file @ eb8a710d
...@@ -84,7 +84,7 @@ KERN_INFO "baycom_ser_hdx: version 0.10 compiled " __TIME__ " " __DATE__ "\n"; ...@@ -84,7 +84,7 @@ KERN_INFO "baycom_ser_hdx: version 0.10 compiled " __TIME__ " " __DATE__ "\n";
#define NR_PORTS 4 #define NR_PORTS 4
static struct net_device baycom_device[NR_PORTS]; static struct net_device *baycom_device[NR_PORTS];
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
...@@ -504,7 +504,6 @@ static int ser12_open(struct net_device *dev) ...@@ -504,7 +504,6 @@ static int ser12_open(struct net_device *dev)
ser12_set_divisor(dev, bc->opt_dcd ? 6 : 4); ser12_set_divisor(dev, bc->opt_dcd ? 6 : 4);
printk(KERN_INFO "%s: ser12 at iobase 0x%lx irq %u uart %s\n", printk(KERN_INFO "%s: ser12 at iobase 0x%lx irq %u uart %s\n",
bc_drvname, dev->base_addr, dev->irq, uart_str[u]); bc_drvname, dev->base_addr, dev->irq, uart_str[u]);
MOD_INC_USE_COUNT;
return 0; return 0;
} }
...@@ -525,7 +524,6 @@ static int ser12_close(struct net_device *dev) ...@@ -525,7 +524,6 @@ static int ser12_close(struct net_device *dev)
release_region(dev->base_addr, SER12_EXTENT); release_region(dev->base_addr, SER12_EXTENT);
printk(KERN_INFO "%s: close ser12 at iobase 0x%lx irq %u\n", printk(KERN_INFO "%s: close ser12 at iobase 0x%lx irq %u\n",
bc_drvname, dev->base_addr, dev->irq); bc_drvname, dev->base_addr, dev->irq);
MOD_DEC_USE_COUNT;
return 0; return 0;
} }
...@@ -658,35 +656,38 @@ MODULE_LICENSE("GPL"); ...@@ -658,35 +656,38 @@ MODULE_LICENSE("GPL");
static int __init init_baycomserhdx(void) static int __init init_baycomserhdx(void)
{ {
int i, j, found = 0; int i, found = 0;
char set_hw = 1; char set_hw = 1;
struct baycom_state *bc;
printk(bc_drvinfo); printk(bc_drvinfo);
/* /*
* register net devices * register net devices
*/ */
for (i = 0; i < NR_PORTS; i++) { for (i = 0; i < NR_PORTS; i++) {
struct net_device *dev = baycom_device+i; struct net_device *dev;
struct baycom_state *bc;
char ifname[IFNAMSIZ]; char ifname[IFNAMSIZ];
sprintf(ifname, "bcsh%d", i); sprintf(ifname, "bcsh%d", i);
if (!mode[i]) if (!mode[i])
set_hw = 0; set_hw = 0;
if (!set_hw) if (!set_hw)
iobase[i] = irq[i] = 0; iobase[i] = irq[i] = 0;
j = hdlcdrv_register_hdlcdrv(dev, &ser12_ops, sizeof(struct baycom_state),
dev = hdlcdrv_register(&ser12_ops,
sizeof(struct baycom_state),
ifname, iobase[i], irq[i], 0); ifname, iobase[i], irq[i], 0);
if (!j) { if (IS_ERR(dev))
break;
bc = (struct baycom_state *)dev->priv; bc = (struct baycom_state *)dev->priv;
if (set_hw && baycom_setmode(bc, mode[i])) if (set_hw && baycom_setmode(bc, mode[i]))
set_hw = 0; set_hw = 0;
found++; found++;
} else { baycom_device[i] = dev;
printk(KERN_WARNING "%s: cannot register net device\n",
bc_drvname);
}
} }
if (!found) if (!found)
return -ENXIO; return -ENXIO;
return 0; return 0;
...@@ -697,16 +698,10 @@ static void __exit cleanup_baycomserhdx(void) ...@@ -697,16 +698,10 @@ static void __exit cleanup_baycomserhdx(void)
int i; int i;
for(i = 0; i < NR_PORTS; i++) { for(i = 0; i < NR_PORTS; i++) {
struct net_device *dev = baycom_device+i; struct net_device *dev = baycom_device[i];
struct baycom_state *bc = (struct baycom_state *)dev->priv;
if (bc) { if (dev)
if (bc->hdrv.magic != HDLCDRV_MAGIC) hdlcdrv_unregister(dev);
printk(KERN_ERR "baycom: invalid magic in "
"cleanup_module\n");
else
hdlcdrv_unregister_hdlcdrv(dev);
}
} }
} }
......
drivers/net/hamradio/hdlcdrv.c
View file @ eb8a710d
...@@ -728,25 +728,15 @@ static int hdlcdrv_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) ...@@ -728,25 +728,15 @@ static int hdlcdrv_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
/* /*
* Check for a network adaptor of this type, and return '0' if one exists. * Initialize fields in hdlcdrv
* If dev->base_addr == 0, probe all likely locations.
* If dev->base_addr == 1, always return failure.
* If dev->base_addr == 2, allocate space for the device and return success
* (detachable devices only).
*/ */
static int hdlcdrv_probe(struct net_device *dev) static void hdlcdrv_setup(struct net_device *dev)
{ {
const struct hdlcdrv_channel_params dflt_ch_params = { static const struct hdlcdrv_channel_params dflt_ch_params = {
20, 2, 10, 40, 0 20, 2, 10, 40, 0
}; };
struct hdlcdrv_state *s; struct hdlcdrv_state *s = dev->priv;;
if (!dev)
return -ENXIO;
/*
* not a real probe! only initialize data structures
*/
s = (struct hdlcdrv_state *)dev->priv;
/* /*
* initialize the hdlcdrv_state struct * initialize the hdlcdrv_state struct
*/ */
...@@ -805,72 +795,60 @@ static int hdlcdrv_probe(struct net_device *dev) ...@@ -805,72 +795,60 @@ static int hdlcdrv_probe(struct net_device *dev)
memcpy(dev->broadcast, ax25_bcast, AX25_ADDR_LEN); memcpy(dev->broadcast, ax25_bcast, AX25_ADDR_LEN);
memcpy(dev->dev_addr, ax25_nocall, AX25_ADDR_LEN); memcpy(dev->dev_addr, ax25_nocall, AX25_ADDR_LEN);
dev->tx_queue_len = 16; dev->tx_queue_len = 16;
/* New style flags */
dev->flags = 0;
return 0;
} }
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
struct net_device *hdlcdrv_register(const struct hdlcdrv_ops *ops,
int hdlcdrv_register_hdlcdrv(struct net_device *dev, const struct hdlcdrv_ops *ops, unsigned int privsize, const char *ifname,
unsigned int privsize, char *ifname,
unsigned int baseaddr, unsigned int irq, unsigned int baseaddr, unsigned int irq,
unsigned int dma) unsigned int dma)
{ {
struct net_device *dev;
struct hdlcdrv_state *s; struct hdlcdrv_state *s;
int err;
BUG_ON(ops == NULL);
if (!dev || !ops)
return -EACCES;
if (privsize < sizeof(struct hdlcdrv_state)) if (privsize < sizeof(struct hdlcdrv_state))
privsize = sizeof(struct hdlcdrv_state); privsize = sizeof(struct hdlcdrv_state);
memset(dev, 0, sizeof(struct net_device));
if (!(s = dev->priv = kmalloc(privsize, GFP_KERNEL))) dev = alloc_netdev(privsize, ifname, hdlcdrv_setup);
return -ENOMEM; if (!dev)
return ERR_PTR(-ENOMEM);
/* /*
* initialize part of the hdlcdrv_state struct * initialize part of the hdlcdrv_state struct
*/ */
memset(s, 0, privsize); s = dev->priv;
s->magic = HDLCDRV_MAGIC; s->magic = HDLCDRV_MAGIC;
strncpy(dev->name, ifname, sizeof(dev->name));
s->ops = ops; s->ops = ops;
/*
* initialize part of the device struct
*/
dev->if_port = 0;
dev->init = hdlcdrv_probe;
dev->base_addr = baseaddr; dev->base_addr = baseaddr;
dev->irq = irq; dev->irq = irq;
dev->dma = dma; dev->dma = dma;
if (register_netdev(dev)) {
err = register_netdev(dev);
if (err < 0) {
printk(KERN_WARNING "hdlcdrv: cannot register net " printk(KERN_WARNING "hdlcdrv: cannot register net "
"device %s\n", dev->name); "device %s\n", dev->name);
kfree(dev->priv); kfree(dev);
return -ENXIO; dev = ERR_PTR(err);
} }
MOD_INC_USE_COUNT; return dev;
return 0;
} }
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
int hdlcdrv_unregister_hdlcdrv(struct net_device *dev) void hdlcdrv_unregister(struct net_device *dev)
{ {
struct hdlcdrv_state *s; struct hdlcdrv_state *s = dev->priv;
BUG_ON(s->magic != HDLCDRV_MAGIC);
if (!dev)
return -EINVAL;
if (!(s = (struct hdlcdrv_state *)dev->priv))
return -EINVAL;
if (s->magic != HDLCDRV_MAGIC)
return -EINVAL;
if (s->ops->close) if (s->ops->close)
s->ops->close(dev); s->ops->close(dev);
unregister_netdev(dev); unregister_netdev(dev);
kfree(s);
MOD_DEC_USE_COUNT; free_netdev(dev);
return 0;
} }
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
...@@ -878,8 +856,8 @@ int hdlcdrv_unregister_hdlcdrv(struct net_device *dev) ...@@ -878,8 +856,8 @@ int hdlcdrv_unregister_hdlcdrv(struct net_device *dev)
EXPORT_SYMBOL(hdlcdrv_receiver); EXPORT_SYMBOL(hdlcdrv_receiver);
EXPORT_SYMBOL(hdlcdrv_transmitter); EXPORT_SYMBOL(hdlcdrv_transmitter);
EXPORT_SYMBOL(hdlcdrv_arbitrate); EXPORT_SYMBOL(hdlcdrv_arbitrate);
EXPORT_SYMBOL(hdlcdrv_register_hdlcdrv); EXPORT_SYMBOL(hdlcdrv_register);
EXPORT_SYMBOL(hdlcdrv_unregister_hdlcdrv); EXPORT_SYMBOL(hdlcdrv_unregister);
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7