diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-24 00:31:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-24 00:31:46 -0700 |
| commit | 59a49e38711a146dc0bef4837c825b5422335460 (patch) | |
| tree | 7e6e3d1850159f94e5b05d1c5775bd3cc87c3690 /drivers | |
| parent | 52c1da39534fb382c061de58b65f678ad74b59f5 (diff) | |
| parent | f2d368fa3ef90f2159d9e542303901ebf68144dd (diff) | |
| download | op-kernel-dev-59a49e38711a146dc0bef4837c825b5422335460.zip op-kernel-dev-59a49e38711a146dc0bef4837c825b5422335460.tar.gz | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/slip.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/net/slip.c b/drivers/net/slip.c index 1911271..c79e0ad 100644 --- a/drivers/net/slip.c +++ b/drivers/net/slip.c @@ -198,18 +198,12 @@ err_exit: static void sl_free_bufs(struct slip *sl) { - void * tmp; - /* Free all SLIP frame buffers. */ - tmp = xchg(&sl->rbuff, NULL); - kfree(tmp); - tmp = xchg(&sl->xbuff, NULL); - kfree(tmp); + kfree(xchg(&sl->rbuff, NULL)); + kfree(xchg(&sl->xbuff, NULL)); #ifdef SL_INCLUDE_CSLIP - tmp = xchg(&sl->cbuff, NULL); - kfree(tmp); - if ((tmp = xchg(&sl->slcomp, NULL)) != NULL) - slhc_free(tmp); + kfree(xchg(&sl->cbuff, NULL)); + slhc_free(xchg(&sl->slcomp, NULL)); #endif } |
