diff options
author | Christoph Schulz <develop@kristov.de> | 2014-07-16 17:41:26 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-07-16 17:48:33 -0400 |
commit | a9f559c37b582c9eb12f82ac9bb77476cfda6309 (patch) | |
tree | 62f129d82c3c434b8715cf807ab4173fe8e302d8 /drivers/net/ppp | |
parent | ed410ecf71a5924676ceb561f53a03119f27d925 (diff) |
net: ppp: access ppp->nextseq only if CONFIG_PPP_MULTILINK is defined
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ppp')
-rw-r--r-- | drivers/net/ppp/ppp_generic.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c index 3ed16a89b5d8..2031ce4051dc 100644 --- a/drivers/net/ppp/ppp_generic.c +++ b/drivers/net/ppp/ppp_generic.c | |||
@@ -655,8 +655,10 @@ static long ppp_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | |||
655 | break; | 655 | break; |
656 | ppp_lock(ppp); | 656 | ppp_lock(ppp); |
657 | cflags = ppp->flags & ~val; | 657 | cflags = ppp->flags & ~val; |
658 | #ifdef CONFIG_PPP_MULTILINK | ||
658 | if (!(ppp->flags & SC_MULTILINK) && (val & SC_MULTILINK)) | 659 | if (!(ppp->flags & SC_MULTILINK) && (val & SC_MULTILINK)) |
659 | ppp->nextseq = 0; | 660 | ppp->nextseq = 0; |
661 | #endif | ||
660 | ppp->flags = val & SC_FLAG_BITS; | 662 | ppp->flags = val & SC_FLAG_BITS; |
661 | ppp_unlock(ppp); | 663 | ppp_unlock(ppp); |
662 | if (cflags & SC_CCP_OPEN) | 664 | if (cflags & SC_CCP_OPEN) |