retronetworking
/
mISDN
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix some warnings 

fix new capidrv interface (2.6)
This commit is contained in:
Karsten Keil 2003-11-25 11:28:32 +00:00
parent 376ee65136
commit a23e7a864e
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/isdn/hardware/mISDN/contr.c
View File

@ -608,11 +608,11 @@ ControllerConstr(Controller_t **contr_p, mISDNstack_t *st, mISDN_pid_t *pid, mIS
sprintf(contr->ctrl->name, "mISDN%d", st->id);
contr->ctrl->driver_name = "mISDN";
contr->ctrl->driverdata = contr;
contr->ctrl->register_appl = RegisterAppl;
contr->ctrl->release_appl = ReleaseAppl;
contr->ctrl->register_appl = RegisterApplication;
contr->ctrl->release_appl = ReleaseApplication;
contr->ctrl->send_message = SendMessage;
contr->ctrl->load_firmware = LoadFirmware;
contr->ctrl->reset_ctr = ResetContr;
contr->ctrl->reset_ctr = ResetController;
contr->ctrl->procinfo = procinfo;
contr->ctrl->ctr_read_proc = read_proc;
retval = attach_capi_ctr(contr->ctrl);

4
drivers/isdn/hardware/mISDN/core.c
View File

@ -445,7 +445,7 @@ mISDN_alloc_entity(int *entity)
spin_lock_irqsave(&entity_lock, flags);
*entity = 1;
while(*entity < MISDN_MAX_ENTITY) {
if (!test_and_set_bit(*entity, entityarray))
if (!test_and_set_bit(*entity, (u_long *)&entityarray[0]))
break;
(*entity)++;
}
@ -462,7 +462,7 @@ mISDN_delete_entity(int entity)
int ret = 0;
spin_lock_irqsave(&entity_lock, flags);
if (!test_and_clear_bit(entity, entityarray)) {
if (!test_and_clear_bit(entity, (u_long *)&entityarray[0])) {
printk(KERN_WARNING "mISDN: del_entity(%d) but entity not allocated\n", entity);
ret = -ENODEV;
}

6
drivers/isdn/hardware/mISDN/m_capi.h
View File

@ -203,7 +203,7 @@ struct _Application {
__u32 CIPmask;
__u32 CIPmask2;
__u32 NotificationMask;
__u32 state;
u_long state;
struct FsmInst listen_m;
int maxplci;
AppPlci_t **AppPlcis;
@ -224,7 +224,7 @@ struct _Plci {
Controller_t *contr;
__u32 addr;
__u32 l3id;
__u32 state;
u_long state;
int nAppl;
struct list_head AppPlcis;
};
@ -262,7 +262,7 @@ struct _Ncci {
Application_t *appl;
struct FsmInst ncci_m;
int window;
__u32 state;
u_long state;
ConfQueue_t xmit_skb_handles[CAPI_MAXDATAWINDOW];
struct sk_buff *recv_skb_handles[CAPI_MAXDATAWINDOW];
struct sk_buff_head squeue;