diff options
| author | Matvejchikov Ilya <matvejchikov@gmail.com> | 2011-07-10 08:49:26 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-11 20:27:57 -0700 |
| commit | 7686d1cc5ed0932a533a5acbc3888b48de63bef8 (patch) | |
| tree | 27ada7381d144df87202a8744453813377365dd0 /drivers | |
| parent | ff1817749f0405c019420fcb415ad20fedec7884 (diff) | |
| download | linux-3.10-7686d1cc5ed0932a533a5acbc3888b48de63bef8.tar.gz linux-3.10-7686d1cc5ed0932a533a5acbc3888b48de63bef8.tar.bz2 linux-3.10-7686d1cc5ed0932a533a5acbc3888b48de63bef8.zip | |
slip: fix wrong SLIP6 ifdef-endif placing
SLIP6 have nothing to do with CSLIP so placing a block of
SLIP6-related code within a CSLIP ifdef-endif block is incorrect.
Signed-off-by: Ilya Matvejchikov <matvejchikov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/slip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/slip.c b/drivers/net/slip.c index 8ec1a9a0bb9..2f110fb30da 100644 --- a/drivers/net/slip.c +++ b/drivers/net/slip.c @@ -182,11 +182,11 @@ static int sl_alloc_bufs(struct slip *sl, int mtu) #ifdef SL_INCLUDE_CSLIP cbuff = xchg(&sl->cbuff, cbuff); slcomp = xchg(&sl->slcomp, slcomp); +#endif #ifdef CONFIG_SLIP_MODE_SLIP6 sl->xdata = 0; sl->xbits = 0; #endif -#endif spin_unlock_bh(&sl->lock); err = 0; |