git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
isdn
/
capi
/
capidrv.c
diff --git
a/drivers/isdn/capi/capidrv.c
b/drivers/isdn/capi/capidrv.c
index
3eae6a5
..
44efe19
100644
(file)
--- a/
drivers/isdn/capi/capidrv.c
+++ b/
drivers/isdn/capi/capidrv.c
@@
-29,7
+29,6
@@
#include <linux/kernelcapi.h>
#include <linux/ctype.h>
#include <linux/init.h>
#include <linux/kernelcapi.h>
#include <linux/ctype.h>
#include <linux/init.h>
-#include <linux/moduleparam.h>
#include <linux/isdn/capiutil.h>
#include <linux/isdn/capicmd.h>
#include <linux/isdn/capiutil.h>
#include <linux/isdn/capicmd.h>
@@
-41,7
+40,7
@@
static int debugmode = 0;
MODULE_DESCRIPTION("CAPI4Linux: Interface to ISDN4Linux");
MODULE_AUTHOR("Carsten Paeth");
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("CAPI4Linux: Interface to ISDN4Linux");
MODULE_AUTHOR("Carsten Paeth");
MODULE_LICENSE("GPL");
-
module_param(debugmode, uint, 0
);
+
MODULE_PARM(debugmode, "i"
);
/* -------- type definitions ----------------------------------------- */
/* -------- type definitions ----------------------------------------- */
@@
-2058,10
+2057,6
@@
static int capidrv_addcontr(u16 contr, struct capi_profile *profp)
return -1;
}
card->myid = card->interface.channels;
return -1;
}
card->myid = card->interface.channels;
- memset(card->bchans, 0, sizeof(capidrv_bchan) * card->nbchan);
- for (i = 0; i < card->nbchan; i++) {
- card->bchans[i].contr = card;
- }
spin_lock_irqsave(&global_lock, flags);
card->next = global.contr_list;
spin_lock_irqsave(&global_lock, flags);
card->next = global.contr_list;
@@
-2069,6
+2064,11
@@
static int capidrv_addcontr(u16 contr, struct capi_profile *profp)
global.ncontr++;
spin_unlock_irqrestore(&global_lock, flags);
global.ncontr++;
spin_unlock_irqrestore(&global_lock, flags);
+ memset(card->bchans, 0, sizeof(capidrv_bchan) * card->nbchan);
+ for (i = 0; i < card->nbchan; i++) {
+ card->bchans[i].contr = card;
+ }
+
cmd.command = ISDN_STAT_RUN;
cmd.driver = card->myid;
card->interface.statcallb(&cmd);
cmd.command = ISDN_STAT_RUN;
cmd.driver = card->myid;
card->interface.statcallb(&cmd);
@@
-2076,9
+2076,10
@@
static int capidrv_addcontr(u16 contr, struct capi_profile *profp)
card->cipmask = 0x1FFF03FF; /* any */
card->cipmask2 = 0;
card->cipmask = 0x1FFF03FF; /* any */
card->cipmask2 = 0;
+ send_listen(card);
+
card->listentimer.data = (unsigned long)card;
card->listentimer.function = listentimerfunc;
card->listentimer.data = (unsigned long)card;
card->listentimer.function = listentimerfunc;
- send_listen(card);
mod_timer(&card->listentimer, jiffies + 60*HZ);
printk(KERN_INFO "%s: now up (%d B channels)\n",
mod_timer(&card->listentimer, jiffies + 60*HZ);
printk(KERN_INFO "%s: now up (%d B channels)\n",