diff options
| author |   Krzysztof Hałasa <khc@pm.waw.pl> | 2008-07-01 21:14:43 +0200 |
|---|---|---|
| committer | Krzysztof Hałasa <khc@pm.waw.pl> | 2008-07-23 23:00:37 +0200 |
| commit | ea966165a306ad4243b7bf62c848288c4286a8b7 (patch) | |
| tree | d9a7d7efe038cabf45c37f79269f37757d75a672 /drivers/net/wan/pc300_drv.c | |
| parent | WAN: Remove unneeded "#include <net/syncppp.h>" (diff) | |
| download | linux-dev-ea966165a306ad4243b7bf62c848288c4286a8b7.tar.xz linux-dev-ea966165a306ad4243b7bf62c848288c4286a8b7.zip | |
WAN: Remove dead code from PC300 driver, part #1
Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
Diffstat (limited to 'drivers/net/wan/pc300_drv.c')
| -rw-r--r-- | drivers/net/wan/pc300_drv.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c index 694df44d2e4f..3226a745571a 100644 --- a/drivers/net/wan/pc300_drv.c +++ b/drivers/net/wan/pc300_drv.c @@ -3150,19 +3150,10 @@ int cpc_open(struct net_device *dev) printk("pc300: cpc_open"); #endif -#ifdef FIXME - if (hdlc->proto.id == IF_PROTO_PPP) { - d->if_ptr = &hdlc->state.ppp.pppdev; - } -#endif - result = hdlc_open(dev); - if (/* FIXME hdlc->proto.id == IF_PROTO_PPP*/ 0) { - dev->priv = d; - } - if (result) { + + if (result) return result; - } sprintf(ifr.ifr_name, "%s", dev->name); result = cpc_opench(d); @@ -3195,9 +3186,7 @@ static int cpc_close(struct net_device *dev) CPC_UNLOCK(card, flags); hdlc_close(dev); - if (/* FIXME hdlc->proto.id == IF_PROTO_PPP*/ 0) { - d->if_ptr = NULL; - } + #ifdef CONFIG_PC300_MLPPP if (chan->conf.proto == PC300_PROTO_MLPPP) { cpc_tty_unregister_service(d); @@ -3358,7 +3347,6 @@ static void cpc_init_card(pc300_t * card) chan->nfree_tx_bd = N_DMA_TX_BUF; d->chan = chan; - d->tx_skb = NULL; d->trace_on = 0; d->line_on = 0; d->line_off = 0; |