diff options
Diffstat (limited to 'drivers/net/ppp_mppe.c')
-rw-r--r-- | drivers/net/ppp_mppe.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ppp_mppe.c b/drivers/net/ppp_mppe.c index 88f03c9e9403..6d1a1b80cc3e 100644 --- a/drivers/net/ppp_mppe.c +++ b/drivers/net/ppp_mppe.c | |||
@@ -195,8 +195,8 @@ static void *mppe_alloc(unsigned char *options, int optlen) | |||
195 | struct ppp_mppe_state *state; | 195 | struct ppp_mppe_state *state; |
196 | unsigned int digestsize; | 196 | unsigned int digestsize; |
197 | 197 | ||
198 | if (optlen != CILEN_MPPE + sizeof(state->master_key) | 198 | if (optlen != CILEN_MPPE + sizeof(state->master_key) || |
199 | || options[0] != CI_MPPE || options[1] != CILEN_MPPE) | 199 | options[0] != CI_MPPE || options[1] != CILEN_MPPE) |
200 | goto out; | 200 | goto out; |
201 | 201 | ||
202 | state = kzalloc(sizeof(*state), GFP_KERNEL); | 202 | state = kzalloc(sizeof(*state), GFP_KERNEL); |
@@ -276,8 +276,8 @@ mppe_init(void *arg, unsigned char *options, int optlen, int unit, int debug, | |||
276 | struct ppp_mppe_state *state = (struct ppp_mppe_state *) arg; | 276 | struct ppp_mppe_state *state = (struct ppp_mppe_state *) arg; |
277 | unsigned char mppe_opts; | 277 | unsigned char mppe_opts; |
278 | 278 | ||
279 | if (optlen != CILEN_MPPE | 279 | if (optlen != CILEN_MPPE || |
280 | || options[0] != CI_MPPE || options[1] != CILEN_MPPE) | 280 | options[0] != CI_MPPE || options[1] != CILEN_MPPE) |
281 | return 0; | 281 | return 0; |
282 | 282 | ||
283 | MPPE_CI_TO_OPTS(&options[2], mppe_opts); | 283 | MPPE_CI_TO_OPTS(&options[2], mppe_opts); |