From d67a614e2191cb737f67f52b2fac1b1f8032ccd9 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger <shemminger@osdl.org> Date: Fri, 26 Sep 2003 22:31:59 -0400 Subject: [PATCH] [PATCH] sealevel -- syncppp startup fix The sealevel driver called sppp_attach before checking that board existed and never called detach in the error path. My change is to call sppp_attach from the netdev->init hook which happens later in the process, and call detach from the uninit hook. Also, changed the structure element 'netdev' to 'pppdev' to avoid confusion. Here is the fix against 2.6.0-test5 latest --- drivers/net/wan/sealevel.c | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/drivers/net/wan/sealevel.c b/drivers/net/wan/sealevel.c index 250f5ea9bb75..fce2b7be1706 100644 --- a/drivers/net/wan/sealevel.c +++ b/drivers/net/wan/sealevel.c @@ -32,7 +32,7 @@ struct slvl_device { struct z8530_channel *chan; - struct ppp_device netdev; + struct ppp_device pppdev; int channel; }; @@ -199,11 +199,24 @@ static int sealevel_neigh_setup_dev(struct net_device *dev, struct neigh_parms * return 0; } +static int sealevel_attach(struct net_device *dev) +{ + struct slvl_device *sv = dev->priv; + sppp_attach(&sv->pppdev); + return 0; +} + +static void sealevel_detach(struct net_device *dev) +{ + sppp_detach(dev); +} static void slvl_setup(struct net_device *d) { d->open = sealevel_open; d->stop = sealevel_close; + d->init = sealevel_attach; + d->uninit = sealevel_detach; d->hard_start_xmit = sealevel_queue_xmit; d->get_stats = sealevel_get_stats; d->set_multicast_list = NULL; @@ -225,11 +238,10 @@ static inline struct slvl_device *slvl_alloc(int iobase, int irq) return NULL; sv = d->priv; - sv->netdev.dev = d; + sv->pppdev.dev = d; d->base_addr = iobase; d->irq = irq; - sppp_attach(&sv->netdev); return sv; } @@ -315,8 +327,8 @@ static __init struct slvl_board *slvl_init(int iobase, int irq, dev->irq=irq; dev->chanA.private=&b->dev[0]; dev->chanB.private=&b->dev[1]; - dev->chanA.netdevice=b->dev[0]->netdev.dev; - dev->chanB.netdevice=b->dev[1]->netdev.dev; + dev->chanA.netdevice=b->dev[0]->pppdev.dev; + dev->chanB.netdevice=b->dev[1]->pppdev.dev; dev->chanA.dev=dev; dev->chanB.dev=dev; @@ -357,10 +369,10 @@ static __init struct slvl_board *slvl_init(int iobase, int irq, enable_irq(irq); - if (register_netdev(b->dev[0]->netdev.dev)) + if (register_netdev(b->dev[0]->pppdev.dev)) goto dmafail2; - if (register_netdev(b->dev[1]->netdev.dev)) + if (register_netdev(b->dev[1]->pppdev.dev)) goto fail_unit; z8530_describe(dev, "I/O", iobase); @@ -368,7 +380,7 @@ static __init struct slvl_board *slvl_init(int iobase, int irq, return b; fail_unit: - unregister_netdev(b->dev[0]->netdev.dev); + unregister_netdev(b->dev[0]->pppdev.dev); dmafail2: free_dma(dev->chanA.rxdma); @@ -377,9 +389,9 @@ static __init struct slvl_board *slvl_init(int iobase, int irq, fail: free_irq(irq, dev); fail1_1: - free_netdev(b->dev[1]->netdev.dev); + free_netdev(b->dev[1]->pppdev.dev); fail1_0: - free_netdev(b->dev[0]->netdev.dev); + free_netdev(b->dev[0]->pppdev.dev); fail2: kfree(b); fail3: @@ -395,9 +407,7 @@ static void __exit slvl_shutdown(struct slvl_board *b) for(u=0; u<2; u++) { - struct net_device *d = b->dev[u]->netdev.dev; - sppp_detach(d); - + struct net_device *d = b->dev[u]->pppdev.dev; unregister_netdev(d); free_netdev(d); } -- 2.30.9