diff options
| author | David S. Miller <davem@davemloft.net> | 2011-07-14 07:56:40 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-14 07:56:40 -0700 |
| commit | 6a7ebdf2fd15417e87b4fd02ff411aeaca34da5f (patch) | |
| tree | 86b15d8cd3e25c97b348b5a61bdb16c02726a480 /drivers/net/slip.c | |
| parent | f6b72b6217f8c24f2a54988e58af858b4e66024d (diff) | |
| parent | 51414d41084496aaefd06d7f19eb8206e8bfac2d (diff) | |
| download | linux-3.10-6a7ebdf2fd15417e87b4fd02ff411aeaca34da5f.tar.gz linux-3.10-6a7ebdf2fd15417e87b4fd02ff411aeaca34da5f.tar.bz2 linux-3.10-6a7ebdf2fd15417e87b4fd02ff411aeaca34da5f.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/bluetooth/l2cap_core.c
Diffstat (limited to 'drivers/net/slip.c')
| -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 11c9ab3b1e1..8befe697bd7 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; |