* [PATCH net-next 1/1] net: ppp: access ppp->nextseq only if CONFIG_PPP_MULTILINK is defined
@ 2014-07-16 21:41 Christoph Schulz
2014-07-16 21:48 ` Sergei Shtylyov
2014-07-16 21:48 ` David Miller
0 siblings, 2 replies; 4+ messages in thread
From: Christoph Schulz @ 2014-07-16 21:41 UTC (permalink / raw)
To: netdev@vger.kernel.org; +Cc: linux-ppp, Paul Mackerras
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>
---
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)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH net-next 1/1] net: ppp: access ppp->nextseq only if CONFIG_PPP_MULTILINK is defined
2014-07-16 21:41 [PATCH net-next 1/1] net: ppp: access ppp->nextseq only if CONFIG_PPP_MULTILINK is defined Christoph Schulz
@ 2014-07-16 21:48 ` Sergei Shtylyov
2014-07-17 6:37 ` Christoph Schulz
2014-07-16 21:48 ` David Miller
1 sibling, 1 reply; 4+ messages in thread
From: Sergei Shtylyov @ 2014-07-16 21:48 UTC (permalink / raw)
To: Christoph Schulz, netdev@vger.kernel.org; +Cc: linux-ppp, Paul Mackerras
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net-next 1/1] net: ppp: access ppp->nextseq only if CONFIG_PPP_MULTILINK is defined
2014-07-16 21:41 [PATCH net-next 1/1] net: ppp: access ppp->nextseq only if CONFIG_PPP_MULTILINK is defined Christoph Schulz
2014-07-16 21:48 ` Sergei Shtylyov
@ 2014-07-16 21:48 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2014-07-16 21:48 UTC (permalink / raw)
To: develop; +Cc: netdev, linux-ppp, paulus
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.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH net-next 1/1] net: ppp: access ppp->nextseq only if CONFIG_PPP_MULTILINK is defined
2014-07-16 21:48 ` Sergei Shtylyov
@ 2014-07-17 6:37 ` Christoph Schulz
0 siblings, 0 replies; 4+ messages in thread
From: Christoph Schulz @ 2014-07-17 6:37 UTC (permalink / raw)
To: Sergei Shtylyov; +Cc: netdev@vger.kernel.org, linux-ppp, Paul Mackerras
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-07-17 6:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-16 21:41 [PATCH net-next 1/1] net: ppp: access ppp->nextseq only if CONFIG_PPP_MULTILINK is defined Christoph Schulz
2014-07-16 21:48 ` Sergei Shtylyov
2014-07-17 6:37 ` Christoph Schulz
2014-07-16 21:48 ` David Miller
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).