git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netdev: remove HAVE_ leftovers
[safe/jmp/linux-2.6]
/
drivers
/
net
/
ppp_mppe.c
diff --git
a/drivers/net/ppp_mppe.c
b/drivers/net/ppp_mppe.c
index
b35d794
..
6d1a1b8
100644
(file)
--- a/
drivers/net/ppp_mppe.c
+++ b/
drivers/net/ppp_mppe.c
@@
-46,7
+46,6
@@
#include <linux/err.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/err.h>
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/version.h>
#include <linux/init.h>
#include <linux/types.h>
#include <linux/slab.h>
#include <linux/init.h>
#include <linux/types.h>
#include <linux/slab.h>
@@
-196,8
+195,8
@@
static void *mppe_alloc(unsigned char *options, int optlen)
struct ppp_mppe_state *state;
unsigned int digestsize;
struct ppp_mppe_state *state;
unsigned int digestsize;
- if (optlen != CILEN_MPPE + sizeof(state->master_key)
-
||
options[0] != CI_MPPE || options[1] != CILEN_MPPE)
+ if (optlen != CILEN_MPPE + sizeof(state->master_key)
||
+ options[0] != CI_MPPE || options[1] != CILEN_MPPE)
goto out;
state = kzalloc(sizeof(*state), GFP_KERNEL);
goto out;
state = kzalloc(sizeof(*state), GFP_KERNEL);
@@
-277,8
+276,8
@@
mppe_init(void *arg, unsigned char *options, int optlen, int unit, int debug,
struct ppp_mppe_state *state = (struct ppp_mppe_state *) arg;
unsigned char mppe_opts;
struct ppp_mppe_state *state = (struct ppp_mppe_state *) arg;
unsigned char mppe_opts;
- if (optlen != CILEN_MPPE
-
||
options[0] != CI_MPPE || options[1] != CILEN_MPPE)
+ if (optlen != CILEN_MPPE
||
+ options[0] != CI_MPPE || options[1] != CILEN_MPPE)
return 0;
MPPE_CI_TO_OPTS(&options[2], mppe_opts);
return 0;
MPPE_CI_TO_OPTS(&options[2], mppe_opts);