diff options
| author |   Christoph Schulz <develop@kristov.de> | 2014-07-16 23:41:26 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-07-16 14:48:33 -0700 |
| commit | a9f559c37b582c9eb12f82ac9bb77476cfda6309 (patch) | |
| tree | 62f129d82c3c434b8715cf807ab4173fe8e302d8 /drivers/net/ppp | |
| parent | Merge branch 'sctp-next' (diff) | |
| download | linux-dev-a9f559c37b582c9eb12f82ac9bb77476cfda6309.tar.xz linux-dev-a9f559c37b582c9eb12f82ac9bb77476cfda6309.zip | |
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) 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) |