[root@linux1 LiS-2.8]# diff -r -u head/mod.c /tmp/mod.c --- head/mod.c Mon Mar 6 08:38:51 2000 +++ /tmp/mod.c Wed Nov 1 02:22:09 2000 @@ -676,8 +676,10 @@ lis_fmod_sw[id].f_count = 0; strncpy(lis_fmod_sw[id].f_name, name, LIS_NAMESZ); +#if 0 printk("Streams module \"%s\" registered, id %d\n", lis_fmod_sw[id].f_name, id); +#endif return id; } /* lis_register_strmod */ @@ -713,8 +715,10 @@ apush_drop_mod(id); #endif +#if 0 printk("Streams module \"%s\" unregistered, id %d\n", name, id); +#endif return 0; } /* lis_unregister_strmod */ @@ -851,8 +855,10 @@ else *slot->f_name = '\0'; +#if 0 printk("Streams driver \"%s\" registered, major %lu\n", slot->f_name, major); +#endif return major; } /* lis_register_strdev */ @@ -906,8 +912,10 @@ lis_fstr_sw[major].f_str = NULL; unregister_chrdev(major, lis_fstr_sw[major].f_name); +#if 0 printk("Streams driver \"%s\" unregistered, major %lu\n", lis_fstr_sw[major].f_name, major); +#endif return 0; } /* lis_unregister_strdev */ [root@linux1 LiS-2.8]# diff -r -u head/head.c /tmp/lis/head.c --- head/head.c Tue Apr 11 12:08:08 2000 +++ /tmp/lis/head.c Tue Oct 31 23:32:30 2000 @@ -2350,14 +2350,21 @@ mioc->b_wptr += sizeof(iocblk_t); mioc->b_datap->db_type = M_IOCTL ; iocb->ioc_cmd=ioc->ic_cmd; +#if 0 iocb->ioc_cr = creds ; +#else + iocb->ioc_uid = creds->cr_uid ; + iocb->ioc_gid = creds->cr_gid ; +#endif iocb->ioc_count=ioc->ic_len; iocb->ioc_error=0; iocb->ioc_rval=0; +#if 0 iocb->ioc_filler[0] = 0 ; iocb->ioc_filler[1] = 0 ; iocb->ioc_filler[2] = 0 ; iocb->ioc_filler[3] = 0 ; +#endif iocb->ioc_id = hd->sd_iocseq = ++lis_iocseq; again: if (err < 0 || (err = lis_lock_wioc(hd)) < 0) [root@linux1 LiS-2.8]# diff -r -u util/strconf.c /tmp/lis/strconf.c --- util/strconf.c Sat Mar 4 14:41:43 2000 +++ /tmp/lis/strconf.c Fri Feb 16 14:26:59 2001 @@ -150,7 +150,7 @@ int majors[256] ; /* table of used majors */ int nmajors = 0 ; /* length of table */ -int next_major = 50 ; /* larger than dedicated majors */ +int next_major = 163 ; /* larger than dedicated majors */ driver_info_t *driver_head = NULL ; module_info_t *module_head = NULL ; [root@linux1 LiS-2.8]# diff -r -u head/queue.c /tmp/lis/queue.c --- head/queue.c Wed Dec 1 10:21:57 1999 +++ /tmp/lis/queue.c Tue Oct 31 23:32:30 2000 @@ -434,8 +434,10 @@ { if (q->q_magic != Q_MAGIC) { +#if 0 printk("%s #%u: Queue magic number is 0x%lx, should be 0x%lx\n", file, line, q->q_magic, Q_MAGIC) ; +#endif return(0) ; } [root@linux1 LiS-2.8]# diff -r -u head/linux-mdep.c /tmp/lis/linux-mdep.c --- head/linux-mdep.c Mon Mar 6 12:30:19 2000 +++ /tmp/lis/linux-mdep.c Tue Oct 31 23:32:30 2000 @@ -671,11 +671,15 @@ hook_syscalls(); /* lis_runqueues(); */ /* gets kernel thread created */ +#if 0 printk ("Linux Streams Subsystem ready. Major device number %d.\n" "Version %s %s. Compiled for kernel version %s.\n" "Using %s %s\n", lis_major, lis_version, lis_date, lis_kernel_version, lis_poll_file, lis_stropts_file); +#else + printk ("Linux Streams Subsystem ready. Version %s %s. Compiled for kernel version %s.\n",lis_version, lis_date, lis_kernel_version); +#endif return(0); } @@ -1037,7 +1041,9 @@ (void) p; +#if 0 printk(KERN_INFO "LiS-RunQ running pid=%d\n", current->pid) ; +#endif exit_files(current) ; /* close all files */ exit_mm(current) ; /* detach user pages */ current->pgrp = 1 ; /* detach from parent */ @@ -1083,7 +1089,9 @@ sig_cnt = 0 ; } +#if 0 printk(KERN_INFO "%s exiting pid=%d\n", current->comm, current->pid) ; +#endif lis_runq_open_flag = 0 ; /* logically "closed" */ SEM_DESTROY(&lis_runq_sem) ; /* de-init semaphore */ up(&lis_runq_kill_sem) ; /* OK, we're killed */ [root@linux1 LiS-2.8]# diff -r -u include/sys/strmsg.h /tmp/lis/strmsg.h --- include/sys/strmsg.h Mon Mar 6 08:37:42 2000 +++ /tmp/lis/strmsg.h Tue Oct 31 23:32:51 2000 @@ -162,16 +162,25 @@ struct iocblk { SHARE int ioc_cmd; /* ioctl command type */ +#if 0 cred_t *ioc_cr; /* credentials */ +#else + uid_t ioc_uid; + gid_t ioc_gid; +#endif uint ioc_id; /* ioctl id */ uint ioc_count; /* count of bytes in data field */ int ioc_error; /* error code */ int ioc_rval; /* return value */ +#if 0 long ioc_filler[4]; /* SVR4 compatibility */ +#endif } iocblk_t; +#if 0 #define ioc_uid ioc_cr->cr_uid #define ioc_gid ioc_cr->cr_gid +#endif /* ******************************************************************* */ [root@linux1 LiS-2.8]# diff -r -u drivers/str/Config /tmp/lis/Config --- drivers/str/Config Fri Jan 7 12:03:49 2000 +++ /tmp/lis/Config Tue Oct 31 23:32:43 2000 @@ -18,6 +18,90 @@ driver link-drvr ldl_ * driver sad sad_ * +driver dxb dxb * + +driver fr_0 fr_0 * +driver fr_1 fr_1 * +driver fr_2 fr_2 * +driver fr_3 fr_3 * +driver fr_4 fr_4 * +driver fr_5 fr_5 * +driver fr_6 fr_6 * + +driver x25_0 x25_0 * +driver x25_1 x25_1 * +driver x25_2 x25_2 * +driver x25_3 x25_3 * +driver x25_4 x25_4 * +driver x25_5 x25_5 * +driver x25_6 x25_6 * + +driver wans_0 wans_0 * +driver wans_1 wans_1 * +driver wans_2 wans_2 * +driver wans_3 wans_3 * +driver wans_4 wans_4 * +driver wans_5 wans_5 * +driver wans_6 wans_6 * + +driver wan0_0 wan0_0 * +driver wan0_1 wan0_1 * +driver wan0_2 wan0_2 * +driver wan0_3 wan0_3 * +driver wan0_4 wan0_4 * +driver wan0_5 wan0_5 * +driver wan0_6 wan0_6 * + +driver wan1_0 wan1_0 * +driver wan1_1 wan1_1 * +driver wan1_2 wan1_2 * +driver wan1_3 wan1_3 * +driver wan1_4 wan1_4 * +driver wan1_5 wan1_5 * +driver wan1_6 wan1_6 * + +driver wan2_0 wan2_0 * +driver wan2_1 wan2_1 * +driver wan2_2 wan2_2 * +driver wan2_3 wan2_3 * +driver wan2_4 wan2_4 * +driver wan2_5 wan2_5 * +driver wan2_6 wan2_6 * + +driver wan3_0 wan3_0 * +driver wan3_1 wan3_1 * +driver wan3_2 wan3_2 * +driver wan3_3 wan3_3 * +driver wan3_4 wan3_4 * +driver wan3_5 wan3_5 * +driver wan3_6 wan3_6 * + +driver lapb_0 lapb_0 * +driver lapb_1 lapb_1 * +driver lapb_2 lapb_2 * +driver lapb_3 lapb_3 * +driver lapb_4 lapb_4 * +driver lapb_5 lapb_5 * +driver lapb_6 lapb_6 * + +driver ifre_0 ifre_0 * +driver ifre_1 ifre_1 * +driver ifre_2 ifre_2 * +driver ifre_3 ifre_3 * +driver ifre_4 ifre_4 * +driver ifre_5 ifre_5 * +driver ifre_6 ifre_6 * + +driver ixe_0 ixe_0 * +driver ixe_1 ixe_1 * +driver ixe_2 ixe_2 * +driver ixe_3 ixe_3 * +driver ixe_4 ixe_4 * +driver ixe_5 ixe_5 * +driver ixe_6 ixe_6 * + +driver dgppp dgppp * + # # Pushable module specifications # @@ -29,6 +113,7 @@ module ip_strms ip_to_streams_ module timod timod_ module tirdwr tirdwr_ +module lig lig # # Object name specifications @@ -43,6 +128,91 @@ objname module ip_strms ip_strm_mod objname module timod timod objname module tirdwr tirdwr +objname module lig lig + +objname driver dxb dxb +objname driver fr_0 fr_0 +objname driver fr_1 fr_1 +objname driver fr_2 fr_2 +objname driver fr_3 fr_3 +objname driver fr_4 fr_4 +objname driver fr_5 fr_5 +objname driver fr_6 fr_6 + +objname driver x25_0 x25_0 +objname driver x25_1 x25_1 +objname driver x25_2 x25_2 +objname driver x25_3 x25_3 +objname driver x25_4 x25_4 +objname driver x25_5 x25_5 +objname driver x25_6 x25_6 + +objname driver wans_0 wans_0 +objname driver wans_1 wans_1 +objname driver wans_2 wans_2 +objname driver wans_3 wans_3 +objname driver wans_4 wans_4 +objname driver wans_5 wans_5 +objname driver wans_6 wans_6 + +objname driver wan0_0 wan0_0 +objname driver wan0_1 wan0_1 +objname driver wan0_2 wan0_2 +objname driver wan0_3 wan0_3 +objname driver wan0_4 wan0_4 +objname driver wan0_5 wan0_5 +objname driver wan0_6 wan0_6 + +objname driver wan1_0 wan1_0 +objname driver wan1_1 wan1_1 +objname driver wan1_2 wan1_2 +objname driver wan1_3 wan1_3 +objname driver wan1_4 wan1_4 +objname driver wan1_5 wan1_5 +objname driver wan1_6 wan1_6 + +objname driver wan2_0 wan2_0 +objname driver wan2_1 wan2_1 +objname driver wan2_2 wan2_2 +objname driver wan2_3 wan2_3 +objname driver wan2_4 wan2_4 +objname driver wan2_5 wan2_5 +objname driver wan2_6 wan2_6 + +objname driver wan3_0 wan3_0 +objname driver wan3_1 wan3_1 +objname driver wan3_2 wan3_2 +objname driver wan3_3 wan3_3 +objname driver wan3_4 wan3_4 +objname driver wan3_5 wan3_5 +objname driver wan3_6 wan3_6 + + +objname driver lapb_0 lapb_0 +objname driver lapb_1 lapb_1 +objname driver lapb_2 lapb_2 +objname driver lapb_3 lapb_3 +objname driver lapb_4 lapb_4 +objname driver lapb_5 lapb_5 +objname driver lapb_6 lapb_6 + +objname driver ifre_0 ifre_0 +objname driver ifre_1 ifre_1 +objname driver ifre_2 ifre_2 +objname driver ifre_3 ifre_3 +objname driver ifre_4 ifre_4 +objname driver ifre_5 ifre_5 +objname driver ifre_6 ifre_6 + +objname driver ixe_0 ixe_0 +objname driver ixe_1 ixe_1 +objname driver ixe_2 ixe_2 +objname driver ixe_3 ixe_3 +objname driver ixe_4 ixe_4 +objname driver ixe_5 ixe_5 +objname driver ixe_6 ixe_6 + +objname driver dgppp dgppp # # Autopush specifications @@ -70,6 +240,90 @@ loadable ldl loadable sad +loadable dxb +loadable lig + +loadable fr_0 +loadable fr_1 +loadable fr_2 +loadable fr_3 +loadable fr_4 +loadable fr_5 +loadable fr_6 + +loadable x25_0 +loadable x25_1 +loadable x25_2 +loadable x25_3 +loadable x25_4 +loadable x25_5 +loadable x25_6 + +loadable wans_0 +loadable wans_1 +loadable wans_2 +loadable wans_3 +loadable wans_4 +loadable wans_5 +loadable wans_6 + +loadable wan0_0 +loadable wan0_1 +loadable wan0_2 +loadable wan0_3 +loadable wan0_4 +loadable wan0_5 +loadable wan0_6 + +loadable wan1_0 +loadable wan1_1 +loadable wan1_2 +loadable wan1_3 +loadable wan1_4 +loadable wan1_5 +loadable wan1_6 + +loadable wan2_0 +loadable wan2_1 +loadable wan2_2 +loadable wan2_3 +loadable wan2_4 +loadable wan2_5 +loadable wan2_6 + +loadable wan3_0 +loadable wan3_1 +loadable wan3_2 +loadable wan3_3 +loadable wan3_4 +loadable wan3_5 +loadable wan3_6 + +loadable lapb_0 +loadable lapb_1 +loadable lapb_2 +loadable lapb_3 +loadable lapb_4 +loadable lapb_5 +loadable lapb_6 + +loadable ifre_0 +loadable ifre_1 +loadable ifre_2 +loadable ifre_3 +loadable ifre_4 +loadable ifre_5 +loadable ifre_6 + +loadable ixe_0 +loadable ixe_1 +loadable ixe_2 +loadable ixe_3 +loadable ixe_4 +loadable ixe_5 +loadable ixe_6 + +loadable dgppp # # Initialization specifications # @@ -89,6 +343,92 @@ node /dev/ldl c * clone-drvr link-drvr node /dev/printk c * printk 0 node /dev/sad c * clone-drvr sad + +node /dev/netbrd0 c * dxb 0 +node /dev/dxbkme c * dxb 1 +node /dev/dxbprobe c * dxb 2 +node /dev/fr_0 c * clone-drvr fr_0 +node /dev/fr_1 c * clone-drvr fr_1 +node /dev/fr_2 c * clone-drvr fr_2 +node /dev/fr_3 c * clone-drvr fr_3 +node /dev/fr_4 c * clone-drvr fr_4 +node /dev/fr_5 c * clone-drvr fr_5 +node /dev/fr_6 c * clone-drvr fr_6 + +node /dev/x25_0 c * clone-drvr x25_0 +node /dev/x25_1 c * clone-drvr x25_1 +node /dev/x25_2 c * clone-drvr x25_2 +node /dev/x25_3 c * clone-drvr x25_3 +node /dev/x25_4 c * clone-drvr x25_4 +node /dev/x25_5 c * clone-drvr x25_5 +node /dev/x25_6 c * clone-drvr x25_6 + +node /dev/wans_0 c * clone-drvr wans_0 +node /dev/wans_1 c * clone-drvr wans_1 +node /dev/wans_2 c * clone-drvr wans_2 +node /dev/wans_3 c * clone-drvr wans_3 +node /dev/wans_4 c * clone-drvr wans_4 +node /dev/wans_5 c * clone-drvr wans_5 +node /dev/wans_6 c * clone-drvr wans_6 + +node /dev/wan0_0 c * clone-drvr wan0_0 +node /dev/wan0_1 c * clone-drvr wan0_1 +node /dev/wan0_2 c * clone-drvr wan0_2 +node /dev/wan0_3 c * clone-drvr wan0_3 +node /dev/wan0_4 c * clone-drvr wan0_4 +node /dev/wan0_5 c * clone-drvr wan0_5 +node /dev/wan0_6 c * clone-drvr wan0_6 + +node /dev/wan1_0 c * clone-drvr wan1_0 +node /dev/wan1_1 c * clone-drvr wan1_1 +node /dev/wan1_2 c * clone-drvr wan1_2 +node /dev/wan1_3 c * clone-drvr wan1_3 +node /dev/wan1_4 c * clone-drvr wan1_4 +node /dev/wan1_5 c * clone-drvr wan1_5 +node /dev/wan1_6 c * clone-drvr wan1_6 + +node /dev/wan2_0 c * clone-drvr wan2_0 +node /dev/wan2_1 c * clone-drvr wan2_1 +node /dev/wan2_2 c * clone-drvr wan2_2 +node /dev/wan2_3 c * clone-drvr wan2_3 +node /dev/wan2_4 c * clone-drvr wan2_4 +node /dev/wan2_5 c * clone-drvr wan2_5 +node /dev/wan2_6 c * clone-drvr wan2_6 + +node /dev/wan3_0 c * clone-drvr wan3_0 +node /dev/wan3_1 c * clone-drvr wan3_1 +node /dev/wan3_2 c * clone-drvr wan3_2 +node /dev/wan3_3 c * clone-drvr wan3_3 +node /dev/wan3_4 c * clone-drvr wan3_4 +node /dev/wan3_5 c * clone-drvr wan3_5 +node /dev/wan3_6 c * clone-drvr wan3_6 + + +node /dev/lapb_0 c * clone-drvr lapb_0 +node /dev/lapb_1 c * clone-drvr lapb_1 +node /dev/lapb_2 c * clone-drvr lapb_2 +node /dev/lapb_3 c * clone-drvr lapb_3 +node /dev/lapb_4 c * clone-drvr lapb_4 +node /dev/lapb_5 c * clone-drvr lapb_5 +node /dev/lapb_6 c * clone-drvr lapb_6 + +node /dev/ifre_0 c * clone-drvr ifre_0 +node /dev/ifre_1 c * clone-drvr ifre_1 +node /dev/ifre_2 c * clone-drvr ifre_2 +node /dev/ifre_3 c * clone-drvr ifre_3 +node /dev/ifre_4 c * clone-drvr ifre_4 +node /dev/ifre_5 c * clone-drvr ifre_5 +node /dev/ifre_6 c * clone-drvr ifre_6 + +node /dev/ixe_0 c * clone-drvr ixe_0 +node /dev/ixe_1 c * clone-drvr ixe_1 +node /dev/ixe_2 c * clone-drvr ixe_2 +node /dev/ixe_3 c * clone-drvr ixe_3 +node /dev/ixe_4 c * clone-drvr ixe_4 +node /dev/ixe_5 c * clone-drvr ixe_5 +node /dev/ixe_6 c * clone-drvr ixe_6 + +node /dev/dgppp c * clone-drvr dgppp # # Device specifications