Skip to contentSkip to conversation

net: ppp: access ppp->nextseq only if CONFIG_PPP_MULTILINK is defined

PATCH Applied Christoph Schulz 3 participants 4 messages Jul 16, 2014 – Jul 17, 2014

Subsystems (3)
Networking Network drivers PPP protocol drivers and compressors
lore
Share & tools
lore

Christoph Schulz

author
#0 lore raw

PATCH 1/1 net: ppp: access ppp->nextseq only if CONFIG_PPP_MULTILINK is defined

From: Christoph Schulz <[email protected]>

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 <[email protected]>

---

drivers/net/ppp/ppp_generic.c +2 -0
index c38ee90..458be47 100644
@@ -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)
#1 lore raw

Hello.

Quoted 3 lines · Christoph Schulz

From: Christoph Schulz <[email protected]>

Commit d762d038497c9df51c19fcbe69b094b3bf8e5568 resets the counter holding the

Please also specify that commit's summary line in parens.

Quoted 6 lines

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 <[email protected]>

WBR, Sergei

author
#2 lore raw

Hello!

Sergei Shtylyov schrieb am Thu, 17 Jul 2014 01:48:32 +0400:

Quoted 1 line

Please also specify that commit's summary line in parens.

Sorry, I will think of it in the future.

Thank you,

Christoph Schulz

maintainer Applied
#3 lore raw
In reply to Christoph Schulz

From: Christoph Schulz <[email protected]>
Date: Wed, 16 Jul 2014 23:41:26 +0200

Quoted 9 lines

From: Christoph Schulz <[email protected]>

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 <[email protected]>

Applied, thanks.