| Message ID | 53C6F186.30809@kristov.de |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
Hello. On 07/17/2014 01:41 AM, Christoph Schulz wrote: > From: Christoph Schulz <develop@kristov.de> > Commit d762d038497c9df51c19fcbe69b094b3bf8e5568 resets the counter holding the Please also specify that commit's summary line in parens. > next sequence number for multilink PPP fragments to zero whenever the > SC_MULTILINK flag is set. However, this counter only exists if > CONFIG_PPP_MULTILINK is defined. Consequently, the new code has to be enclosed > within #ifdef CONFIG_PPP_MULTILINK ... #endif. > Signed-off-by: Christoph Schulz <develop@kristov.de> WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Christoph Schulz <develop@kristov.de> Date: Wed, 16 Jul 2014 23:41:26 +0200 > From: Christoph Schulz <develop@kristov.de> > > Commit d762d038497c9df51c19fcbe69b094b3bf8e5568 resets the counter holding the > next sequence number for multilink PPP fragments to zero whenever the > SC_MULTILINK flag is set. However, this counter only exists if > CONFIG_PPP_MULTILINK is defined. Consequently, the new code has to be enclosed > within #ifdef CONFIG_PPP_MULTILINK ... #endif. > > Signed-off-by: Christoph Schulz <develop@kristov.de> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hello!
Sergei Shtylyov schrieb am Thu, 17 Jul 2014 01:48:32 +0400:
> Please also specify that commit's summary line in parens.
Sorry, I will think of it in the future.
Thank you,
Christoph Schulz
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c index c38ee90..458be47 100644 --- a/drivers/net/ppp/ppp_generic.c +++ b/drivers/net/ppp/ppp_generic.c @@ -661,8 +661,10 @@ static long ppp_ioctl(struct file *file, unsigned int cmd, unsigned long arg) break; ppp_lock(ppp); cflags = ppp->flags & ~val; +#ifdef CONFIG_PPP_MULTILINK if (!(ppp->flags & SC_MULTILINK) && (val & SC_MULTILINK)) ppp->nextseq = 0; +#endif ppp->flags = val & SC_FLAG_BITS; ppp_unlock(ppp); if (cflags & SC_CCP_OPEN)