Remove dead code from wanmain.c, CONFIG_WANPIPE_MULTPPP doesn't exist
Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
This commit is contained in:
Родитель
efa415840d
Коммит
a24e202e3f
|
@ -567,9 +567,6 @@ static int wanrouter_device_new_if(struct wan_device *wandev,
|
|||
{
|
||||
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))
|
||||
|
@ -588,25 +585,10 @@ static int wanrouter_device_new_if(struct wan_device *wandev,
|
|||
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;
|
||||
|
@ -661,17 +643,9 @@ static int wanrouter_device_new_if(struct wan_device *wandev,
|
|||
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);
|
||||
return err;
|
||||
|
|
Загрузка…
Ссылка в новой задаче