Messages in this thread Patch in this message | | | Date | Tue, 31 Jul 2007 22:36:36 +0200 | Subject | [RFC][PATCH] Get rid of dead code in net/wanrouter/wanmain.c | From | Michal Piotrowski <> |
| |
Hi,
File /home/devel/linux-rdc/net/wanrouter/wanmain.c line 569 Unknown CONFIG option! CONFIG_WANPIPE_MULTPPP File /home/devel/linux-rdc/net/wanrouter/wanmain.c line 590 Unknown CONFIG option! CONFIG_WANPIPE_MULTPPP File /home/devel/linux-rdc/net/wanrouter/wanmain.c line 663 Unknown CONFIG option! CONFIG_WANPIPE_MULTPPP
Regards, Michal
-- LOG http://www.stardust.webpages.pl/log/
Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski@gmail.com>
--- linux-rdc-clean/net/wanrouter/wanmain.c 2007-07-09 01:32:17.000000000 +0200 +++ linux-rdc/net/wanrouter/wanmain.c 2007-07-31 18:04:58.000000000 +0200 @@ -566,9 +566,6 @@ static int wanrouter_device_new_if(struc { wanif_conf_t *cnf; struct net_device *dev = NULL; -#ifdef CONFIG_WANPIPE_MULTPPP - struct ppp_device *pppdev=NULL; -#endif int err; if ((wandev->state == WAN_UNCONFIGURED) || (wandev->new_if == NULL)) @@ -587,25 +584,10 @@ static int wanrouter_device_new_if(struc goto out; if (cnf->config_id == WANCONFIG_MPPP) { -#ifdef CONFIG_WANPIPE_MULTPPP - pppdev = kzalloc(sizeof(struct ppp_device), GFP_KERNEL); - err = -ENOBUFS; - if (pppdev == NULL) - goto out; - pppdev->dev = kzalloc(sizeof(struct net_device), GFP_KERNEL); - if (pppdev->dev == NULL) { - kfree(pppdev); - err = -ENOBUFS; - goto out; - } - err = wandev->new_if(wandev, (struct net_device *)pppdev, cnf); - dev = pppdev->dev; -#else printk(KERN_INFO "%s: Wanpipe Mulit-Port PPP support has not been compiled in!\n", wandev->name); err = -EPROTONOSUPPORT; goto out; -#endif } else { dev = kzalloc(sizeof(struct net_device), GFP_KERNEL); err = -ENOBUFS; @@ -660,16 +642,9 @@ static int wanrouter_device_new_if(struc kfree(dev->priv); dev->priv = NULL; -#ifdef CONFIG_WANPIPE_MULTPPP - if (cnf->config_id == WANCONFIG_MPPP) - kfree(pppdev); - else - kfree(dev); -#else /* Sync PPP is disabled */ if (cnf->config_id != WANCONFIG_MPPP) kfree(dev); -#endif out: kfree(cnf); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |