]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
slip: fix wrong SLIP6 ifdef-endif placing
authorMatvejchikov Ilya <matvejchikov@gmail.com>
Sun, 10 Jul 2011 08:49:26 +0000 (08:49 +0000)
committerDavid 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

index 8ec1a9a0bb9ae007c69865b2599f07d3f23c99c8..2f110fb30daa9e9417c99b1e8f925e5e606bec96 100644 (file)
@@ -182,10 +182,10 @@ 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;