diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-10 11:06:04 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-10 11:06:04 +1100 |
| commit | 31e7f1ff3c5d39a70da85f7d81a1ab1f4e64fa97 (patch) | |
| tree | a6cb8f14b1182e5dce55d13e52c1182a8c7e0402 /net/wanrouter/wanmain.c | |
| parent | fca5dcd4835ed09bb1a48a355344aff7a25c76e0 (diff) | |
| parent | 6730c3c14421b7c924d06e31bb66e0adad225547 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'net/wanrouter/wanmain.c')
| -rw-r--r-- | net/wanrouter/wanmain.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/net/wanrouter/wanmain.c b/net/wanrouter/wanmain.c index 13b650ad22e..bcf7b3faa76 100644 --- a/net/wanrouter/wanmain.c +++ b/net/wanrouter/wanmain.c @@ -714,10 +714,8 @@ static int wanrouter_device_new_if(struct wan_device *wandev, } /* This code has moved from del_if() function */ - if (dev->priv) { - kfree(dev->priv); - dev->priv = NULL; - } + kfree(dev->priv); + dev->priv = NULL; #ifdef CONFIG_WANPIPE_MULTPPP if (cnf->config_id == WANCONFIG_MPPP) @@ -851,10 +849,8 @@ static int wanrouter_delete_interface(struct wan_device *wandev, char *name) /* Due to new interface linking method using dev->priv, * this code has moved from del_if() function.*/ - if (dev->priv){ - kfree(dev->priv); - dev->priv=NULL; - } + kfree(dev->priv); + dev->priv=NULL; unregister_netdev(dev); |