From: David Fernandez <david.fernandez.work@googlemail.com>
To: linux-ppp@vger.kernel.org
Subject: Re: SOLVED: kernel-mode PPPoE does not seem able to work with MPPE.
Date: Mon, 06 Nov 2017 14:59:24 +0000 [thread overview]
Message-ID: <65b0fb13-a602-4370-2ae7-5fe78a7d7560@googlemail.com> (raw)
In-Reply-To: <7587137d-f9ae-a4ac-843e-6688af5ff017@googlemail.com>
On 06/11/17 14:19, Charlie Brady wrote:
> Why would you do this, rather than just delete the code you are removing?
>
>> --- a/drivers/net/ppp/ppp_mppe.c
>> +++ b/drivers/net/ppp/ppp_mppe.c
>> @@ -521,11 +521,12 @@ mppe_decompress(void *arg, unsigned char
>> state->sanity_errors += 100;
>> goto sanity_error;
>> }
>> - if (state->stateful && ((ccount & 0xff) = 0xff) && !flushed) {
>> + if (state->stateful && ((ccount & 0xff) = 0xff) && !flushed)
>> {/*
>> printk(KERN_DEBUG "mppe_decompress[%d]: FLUSHED
>> bit not set on "
>> "flag packet!\n", state->unit);
>> state->sanity_errors += 100;
>> - goto sanity_error;
>> + goto sanity_error;*/
>> + flushed = 1;
>> }
Hi Charlie,
Yes, the code could be deleted, I just wanted somebody to check and say
that there is no point in yet putting a warning in the log for this...
Definitely you could do:
--- a/drivers/net/ppp/ppp_mppe.c
+++ b/drivers/net/ppp/ppp_mppe.c
@@ -521,11 +521,7 @@ mppe_decompress(void *arg, unsigned char
state->sanity_errors += 100;
goto sanity_error;
}
- if (state->stateful && ((ccount & 0xff) = 0xff) && !flushed) {
+ if (state->stateful && ((ccount & 0xff) = 0xff) && !flushed)
- printk(KERN_DEBUG "mppe_decompress[%d]: FLUSHED bit not
set on "
- "flag packet!\n", state->unit);
- state->sanity_errors += 100;
- goto sanity_error;
+ flushed = 1;
- }
/*
@@ -586,8 +587,9 @@ mppe_decompress(void *arg, unsigned char
*/
}
}
- if (flushed)
+ if (flushed && (state->bits & 1) != 0)
mppe_rekey(state, 0);
+ state->bits |= 1;
}
/*
Would be good to have this patch in the current and previous kernel
versions, as it seems to apply cleanly enough.
If there is anything I can do to prepare a more formal patch, let me
know. Specially some formating and changelog things that I am not aware of.
Regards
next prev parent reply other threads:[~2017-11-06 14:59 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-26 10:39 SOLVED: kernel-mode PPPoE does not seem able to work with MPPE David Fernandez
2017-11-06 10:55 ` David Fernandez
2017-11-06 14:19 ` Charlie Brady
2017-11-06 14:59 ` David Fernandez [this message]
2017-11-06 18:31 ` James Carlson
2017-11-17 10:16 ` David Fernandez
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=65b0fb13-a602-4370-2ae7-5fe78a7d7560@googlemail.com \
--to=david.fernandez.work@googlemail.com \
--cc=linux-ppp@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).