diff options
author | Krzysztof Hałasa <khc@pm.waw.pl> | 2008-07-01 15:14:43 -0400 |
---|---|---|
committer | Krzysztof Hałasa <khc@pm.waw.pl> | 2008-07-23 17:00:37 -0400 |
commit | ea966165a306ad4243b7bf62c848288c4286a8b7 (patch) | |
tree | d9a7d7efe038cabf45c37f79269f37757d75a672 /drivers/net/wan/pc300_drv.c | |
parent | c1a0f0cdf95569c06946eed81c2fc7e04b272db4 (diff) |
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) | |||
3150 | printk("pc300: cpc_open"); | 3150 | printk("pc300: cpc_open"); |
3151 | #endif | 3151 | #endif |
3152 | 3152 | ||
3153 | #ifdef FIXME | ||
3154 | if (hdlc->proto.id == IF_PROTO_PPP) { | ||
3155 | d->if_ptr = &hdlc->state.ppp.pppdev; | ||
3156 | } | ||
3157 | #endif | ||
3158 | |||
3159 | result = hdlc_open(dev); | 3153 | result = hdlc_open(dev); |
3160 | if (/* FIXME hdlc->proto.id == IF_PROTO_PPP*/ 0) { | 3154 | |
3161 | dev->priv = d; | 3155 | if (result) |
3162 | } | ||
3163 | if (result) { | ||
3164 | return result; | 3156 | return result; |
3165 | } | ||
3166 | 3157 | ||
3167 | sprintf(ifr.ifr_name, "%s", dev->name); | 3158 | sprintf(ifr.ifr_name, "%s", dev->name); |
3168 | result = cpc_opench(d); | 3159 | result = cpc_opench(d); |
@@ -3195,9 +3186,7 @@ static int cpc_close(struct net_device *dev) | |||
3195 | CPC_UNLOCK(card, flags); | 3186 | CPC_UNLOCK(card, flags); |
3196 | 3187 | ||
3197 | hdlc_close(dev); | 3188 | hdlc_close(dev); |
3198 | if (/* FIXME hdlc->proto.id == IF_PROTO_PPP*/ 0) { | 3189 | |
3199 | d->if_ptr = NULL; | ||
3200 | } | ||
3201 | #ifdef CONFIG_PC300_MLPPP | 3190 | #ifdef CONFIG_PC300_MLPPP |
3202 | if (chan->conf.proto == PC300_PROTO_MLPPP) { | 3191 | if (chan->conf.proto == PC300_PROTO_MLPPP) { |
3203 | cpc_tty_unregister_service(d); | 3192 | cpc_tty_unregister_service(d); |
@@ -3358,7 +3347,6 @@ static void cpc_init_card(pc300_t * card) | |||
3358 | chan->nfree_tx_bd = N_DMA_TX_BUF; | 3347 | chan->nfree_tx_bd = N_DMA_TX_BUF; |
3359 | 3348 | ||
3360 | d->chan = chan; | 3349 | d->chan = chan; |
3361 | d->tx_skb = NULL; | ||
3362 | d->trace_on = 0; | 3350 | d->trace_on = 0; |
3363 | d->line_on = 0; | 3351 | d->line_on = 0; |
3364 | d->line_off = 0; | 3352 | d->line_off = 0; |