projects
/
platform
/
kernel
/
linux-3.10.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ff18177
)
slip: fix wrong SLIP6 ifdef-endif placing
author
Matvejchikov Ilya
<matvejchikov@gmail.com>
Sun, 10 Jul 2011 08:49:26 +0000
(08:49 +0000)
committer
David S. Miller
<davem@davemloft.net>
Tue, 12 Jul 2011 03:27:57 +0000
(20:27 -0700)
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>
drivers/net/slip.c
patch
|
blob
|
history
diff --git
a/drivers/net/slip.c
b/drivers/net/slip.c
index
8ec1a9a
..
2f110fb
100644
(file)
--- 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;