retronetworking
/
isdn4linux
13
0
Fork 0
Code Pull Requests Releases Activity

incorporated some cosmetic changes from the official kernel tree back 

into CVS
This commit is contained in:
Kai Germaschewski 2000-03-03 16:37:12 +00:00
parent 7fe092d9a5
commit ae7e6db007
6 changed files with 68 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/isdn/avmb1/capi.c
View File

@ -6,6 +6,17 @@
* Copyright 1996 by Carsten Paeth (calle@calle.in-berlin.de)
*
* $Log$
* Revision 1.24 2000/03/03 15:50:42 calle
* - kernel CAPI:
* - Changed parameter "param" in capi_signal from __u32 to void *.
* - rewrote notifier handling in kcapi.c
* - new notifier NCCI_UP and NCCI_DOWN
* - User CAPI:
* - /dev/capi20 is now a cloning device.
* - middleware extentions prepared.
* - capidrv.c
* - locking of list operations and module count updates.
*
* Revision 1.23 2000/02/26 01:00:53 keil
* changes from 2.3.47
*
@ -686,20 +697,13 @@ static int capi_release(struct inode *inode, struct file *file)
static struct file_operations capi_fops =
{
capi_llseek,
capi_read,
capi_write,
NULL, /* capi_readdir */
capi_poll,
capi_ioctl,
NULL, /* capi_mmap */
capi_open,
#ifdef FILEOP_HAS_FLUSH
NULL, /* capi_flush */
#endif
capi_release,
NULL, /* capi_fsync */
NULL, /* capi_fasync */
llseek: capi_llseek,
read: capi_read,
write: capi_write,
poll: capi_poll,
ioctl: capi_ioctl,
open: capi_open,
release: capi_release,
};
/* -------- /proc functions ----------------------------------------- */

24
drivers/isdn/divert/divert_procfs.c
View File

@ -20,6 +20,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* $Log$
* Revision 1.7 2000/03/02 00:11:06 werner
*
* Changes related to procfs for 2.3.48
*
* Revision 1.6 2000/02/14 19:23:03 werner
*
* Changed handling of proc filesystem tables to a more portable version
@ -307,19 +311,14 @@ isdn_divert_lseek(struct file *file, loff_t offset, int orig)
static struct file_operations isdn_fops =
{
isdn_divert_lseek,
isdn_divert_read,
isdn_divert_write,
NULL, /* isdn_readdir */
isdn_divert_poll, /* isdn_poll */
isdn_divert_ioctl, /* isdn_ioctl */
NULL, /* isdn_mmap */
isdn_divert_open,
NULL, /* flush */
isdn_divert_close,
NULL /* fsync */
llseek: isdn_divert_lseek,
read: isdn_divert_read,
write: isdn_divert_write,
poll: isdn_divert_poll,
ioctl: isdn_divert_ioctl,
open: isdn_divert_open,
release: isdn_divert_close,
};
#ifdef COMPAT_NO_SOFTNET
struct inode_operations divert_file_inode_operations;
#endif
@ -358,7 +357,6 @@ divert_dev_init(void)
#else
isdn_divert_entry->proc_fops = &isdn_fops;
#endif
#endif /* CONFIG_PROC_FS */
return (0);

21
drivers/isdn/hysdn/hysdn_procconf.c
View File

@ -20,6 +20,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* $Log$
* Revision 1.3 2000/03/02 00:11:07 werner
*
* Changes related to procfs for 2.3.48
*
* Revision 1.2 2000/02/14 19:23:03 werner
*
* Changed handling of proc filesystem tables to a more portable version
@ -404,23 +408,16 @@ hysdn_conf_close(struct inode *ino, struct file *filep)
/******************************************************/
static struct file_operations conf_fops =
{
hysdn_dummy_lseek,
hysdn_conf_read,
hysdn_conf_write,
NULL, /* readdir */
NULL, /* poll */
NULL, /* ioctl */
NULL, /* mmap */
hysdn_conf_open,
NULL, /* flush */
hysdn_conf_close,
NULL /* fsync */
llseek: hysdn_dummy_lseek,
read: hysdn_conf_read,
write: hysdn_conf_write,
open: hysdn_conf_open,
release: hysdn_conf_close,
};
#ifdef COMPAT_NO_SOFTNET
static struct inode_operations conf_inode_operations;
#endif
/*****************************/
/* hysdn subdir in /proc/net */
/*****************************/

21
drivers/isdn/hysdn/hysdn_proclog.c
View File

@ -20,6 +20,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* $Log$
* Revision 1.3 2000/03/02 00:11:07 werner
*
* Changes related to procfs for 2.3.48
*
* Revision 1.2 2000/02/14 19:23:03 werner
*
* Changed handling of proc filesystem tables to a more portable version
@ -425,17 +429,12 @@ hysdn_log_poll(struct file *file, poll_table * wait)
/**************************************************/
static struct file_operations log_fops =
{
hysdn_dummy_lseek,
hysdn_log_read,
hysdn_log_write,
NULL, /* readdir */
hysdn_log_poll, /* poll */
NULL,
NULL, /* mmap */
hysdn_log_open,
NULL, /* flush */
hysdn_log_close,
NULL /* fsync */
llseek: hysdn_dummy_lseek,
read: hysdn_log_read,
write: hysdn_log_write,
poll: hysdn_log_poll,
open: hysdn_log_open,
release: hysdn_log_close,
};
#ifdef COMPAT_NO_SOFTNET

22
drivers/isdn/isdn_bsdcomp.c
View File

@ -487,7 +487,7 @@ static int bsd_compress (void *state, struct sk_buff *skb_in, struct sk_buff *sk
*(skb_put(skb_out,1)) = (unsigned char) (accm>>24); \
accm <<= 8; \
bitno += 8; \
} while (bitno <= 24); \
} while (bitno <= 24); \
}
#else
#define OUTPUT(ent) \
@ -568,6 +568,7 @@ static int bsd_compress (void *state, struct sk_buff *skb_in, struct sk_buff *sk
#ifdef CONFIG_ISDN_WITH_ABC
secure = 0;
#endif
do {
hval += disp;
if (hval >= db->hsize)
@ -575,11 +576,10 @@ static int bsd_compress (void *state, struct sk_buff *skb_in, struct sk_buff *sk
dictp = dict_ptr (db, hval);
if (dictp->codem1 >= max_ent)
goto nomatch;
}
#ifndef CONFIG_ISDN_WITH_ABC
while (dictp->fcode != fcode);
} while (dictp->fcode != fcode);
#else
while (dictp->fcode != fcode && ++secure < 100000);
} while (dictp->fcode != fcode && ++secure < 100000);
if(secure >= 100000) {
printk(KERN_DEBUG "BSD: compress while dictp->fcode != fcode secure-counter reached\n");
return 0;
@ -839,11 +839,10 @@ static int bsd_decompress (void *state, struct sk_buff *skb_in, struct sk_buff *
p = skb_put(skb_out,codelen);
p += codelen;
#ifdef CONFIG_ISDN_WITH_ABC
for(secure = 0; finchar > LAST && secure < 50000;secure++)
for(secure = 0; finchar > LAST && secure < 50000;secure++) {
#else
while (finchar > LAST)
while (finchar > LAST) {
#endif
{
struct bsd_dict *dictp2 = dict_ptr (db, finchar);
dictp = dict_ptr (db, dictp2->cptr);
@ -913,11 +912,10 @@ static int bsd_decompress (void *state, struct sk_buff *skb_in, struct sk_buff *
if (hval >= db->hsize)
hval -= db->hsize;
dictp = dict_ptr (db, hval);
}
#ifndef CONFIG_ISDN_WITH_ABC
while (dictp->codem1 < max_ent);
} while (dictp->codem1 < max_ent);
#else
while (dictp->codem1 < max_ent && ++secure < 50000);
} while (dictp->codem1 < max_ent && ++secure < 50000);
if(secure >= 50000) {
printk(KERN_DEBUG "BSD: decomp while (dictp->codem1 < max_ent) secure-counter reached\n");
return DECOMP_FATALERROR;
@ -961,7 +959,7 @@ static int bsd_decompress (void *state, struct sk_buff *skb_in, struct sk_buff *
db->comp_bytes += skb_in->len - BSD_OVHD;
db->uncomp_bytes += skb_out->len;
#ifndef CONFIG_ISDN_WITH_ABC
#ifdef CONFIG_ISDN_WITH_ABC
/*
** bsd_check will call bsd_clear
** and so on the internal tables will be cleared.
@ -969,7 +967,7 @@ static int bsd_decompress (void *state, struct sk_buff *skb_in, struct sk_buff *
** I think that's not what we will at this point ?????
** For me at works without bsd_check.
*/
#else
if (bsd_check(db)) {
if (db->debug)
printk(KERN_DEBUG "bsd_decomp%d: peer should have cleared dictionary on %d\n",

21
drivers/isdn/isdn_common.c
View File

@ -21,6 +21,9 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* $Log$
* Revision 1.99 2000/02/26 01:00:52 keil
* changes from 2.3.47
*
* Revision 1.98 2000/02/16 14:56:27 paul
* translated ISDN_MODEM_ANZREG to ISDN_MODEM_NUMREG for english speakers
*
@ -2119,17 +2122,13 @@ isdn_close(struct inode *ino, struct file *filep)
static struct file_operations isdn_fops =
{
isdn_lseek,
isdn_read,
isdn_write,
NULL, /* isdn_readdir */
isdn_poll, /* isdn_poll */
isdn_ioctl, /* isdn_ioctl */
NULL, /* isdn_mmap */
isdn_open,
NULL, /* flush */
isdn_close,
NULL /* fsync */
llseek: isdn_lseek,
read: isdn_read,
write: isdn_write,
poll: isdn_poll,
ioctl: isdn_ioctl,
open: isdn_open,
release: isdn_close,
};
char *