diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-11-28 03:58:46 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-11-28 03:58:46 +0000 |
| commit | b63ad0882a16a5d28003e57f2b0b81dee3fb322b (patch) | |
| tree | 0a343ce219e2b8b38a5d702d66032c57b83d9720 /drivers/atm | |
| parent | a9d7bff9a84dba79609a0002e5321b74c4d64c64 (diff) | |
Merge with 2.4.0-test11.
Diffstat (limited to 'drivers/atm')
| -rw-r--r-- | drivers/atm/atmtcp.c | 1 | ||||
| -rw-r--r-- | drivers/atm/nicstar.c | 18 |
2 files changed, 2 insertions, 17 deletions
diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c index 5e96bf9c9..9c4f2e7f3 100644 --- a/drivers/atm/atmtcp.c +++ b/drivers/atm/atmtcp.c @@ -77,6 +77,7 @@ static int atmtcp_send_control(struct atm_vcc *vcc,int type, set_current_state(TASK_UNINTERRUPTIBLE); schedule(); } + current->state = TASK_RUNNING; remove_wait_queue(&vcc->sleep,&wait); return error; } diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c index e4d709cb0..8b6d71237 100644 --- a/drivers/atm/nicstar.c +++ b/drivers/atm/nicstar.c @@ -271,24 +271,8 @@ static struct atmdev_ops atm_ops = proc_read: ns_proc_read }; static struct timer_list ns_timer; -static char *mac[NS_MAX_CARDS] = { NULL -#if NS_MAX_CARDS > 1 - , NULL -#endif /* NS_MAX_CARDS > 1 */ -#if NS_MAX_CARDS > 2 - , NULL -#endif /* NS_MAX_CARDS > 2 */ -#if NS_MAX_CARDS > 3 - , NULL -#endif /* NS_MAX_CARDS > 3 */ -#if NS_MAX_CARDS > 4 - , NULL -#endif /* NS_MAX_CARDS > 4 */ - }; - -#ifdef MODULE +static char *mac[NS_MAX_CARDS]; MODULE_PARM(mac, "1-" __MODULE_STRING(NS_MAX_CARDS) "s"); -#endif /* MODULE */ /* Functions*******************************************************************/ |