projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[git] change permissions on drivers/net/amd8111e.[ch] to 0644,
[powerpc.git]
/
drivers
/
net
/
slip.c
diff --git
a/drivers/net/slip.c
b/drivers/net/slip.c
index
8f7841c
..
404ea42
100644
(file)
--- a/
drivers/net/slip.c
+++ b/
drivers/net/slip.c
@@
-74,6
+74,7
@@
#include <linux/rtnetlink.h>
#include <linux/if_arp.h>
#include <linux/if_slip.h>
#include <linux/rtnetlink.h>
#include <linux/if_arp.h>
#include <linux/if_slip.h>
+#include <linux/delay.h>
#include <linux/init.h>
#include "slip.h"
#ifdef CONFIG_INET
#include <linux/init.h>
#include "slip.h"
#ifdef CONFIG_INET
@@
-198,18
+199,12
@@
err_exit:
static void
sl_free_bufs(struct slip *sl)
{
static void
sl_free_bufs(struct slip *sl)
{
- void * tmp;
-
/* Free all SLIP frame buffers. */
/* 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
#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
}
#endif
}
@@
-1389,10
+1384,8
@@
static void __exit slip_exit(void)
/* First of all: check for active disciplines and hangup them.
*/
do {
/* First of all: check for active disciplines and hangup them.
*/
do {
- if (busy) {
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(HZ / 10);
- }
+ if (busy)
+ msleep_interruptible(100);
busy = 0;
for (i = 0; i < slip_maxdev; i++) {
busy = 0;
for (i = 0; i < slip_maxdev; i++) {
@@
-1430,7
+1423,7
@@
static void __exit slip_exit(void)
kfree(slip_devs);
slip_devs = NULL;
kfree(slip_devs);
slip_devs = NULL;
- if ((i = tty_
register_ldisc(N_SLIP, NULL
)))
+ if ((i = tty_
unregister_ldisc(N_SLIP
)))
{
printk(KERN_ERR "SLIP: can't unregister line discipline (err = %d)\n", i);
}
{
printk(KERN_ERR "SLIP: can't unregister line discipline (err = %d)\n", i);
}