diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-14 18:01:56 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-14 18:01:56 +0100 |
| commit | b89371621e5bedc84498ced2c5c33976bd1b2f64 (patch) | |
| tree | b309919239586e25617a17785b827577b1abb6b5 /drivers/net/ppp_mppe.c | |
| parent | sound: add Edirol UA-101 support (diff) | |
| parent | ALSA: sb_mixer: convert pointer tables to mixer control tables (diff) | |
| download | linux-b89371621e5bedc84498ced2c5c33976bd1b2f64.tar.xz linux-b89371621e5bedc84498ced2c5c33976bd1b2f64.zip | |
Merge branch 'next/isa' into topic/misc
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) 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); @@ -276,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; - 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); |