Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
a24e202e
Commit
a24e202e
authored
Jul 01, 2008
by
Krzysztof Hałasa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove dead code from wanmain.c, CONFIG_WANPIPE_MULTPPP doesn't exist
Signed-off-by:
Krzysztof Hałasa
<
khc@pm.waw.pl
>
parent
efa41584
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
26 deletions
+0
-26
net/wanrouter/wanmain.c
net/wanrouter/wanmain.c
+0
-26
No files found.
net/wanrouter/wanmain.c
View file @
a24e202e
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment