Merge with Linux 2.4.0-test6-pre9.

10 files changed, 55 insertions, 44 deletions

diff --git a/include/linux/fs.h b/include/linux/fs.h
index d0e5c6267..570aecf20 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -875,7 +875,7 @@ static inline int locks_verify_truncate(struct inode *inode,
 
 asmlinkage long sys_open(const char *, int, int);
 asmlinkage long sys_close(unsigned int);	/* yes, it's really unsigned */
-extern int do_close(unsigned int, int);		/* yes, it's really unsigned */
+extern int do_close(struct files_struct *, unsigned int, int);		/* yes, it's really unsigned */
 extern int do_truncate(struct dentry *, loff_t start);
 
 extern struct file *filp_open(const char *, int, int);
diff --git a/include/linux/isdn.h b/include/linux/isdn.h
index 427e6c8ac..e9550db61 100644
--- a/include/linux/isdn.h
+++ b/include/linux/isdn.h
@@ -276,7 +276,6 @@ typedef struct {
 #define ISDN_TIMER_MODEMXMIT   8
 #define ISDN_TIMER_NETDIAL    16 
 #define ISDN_TIMER_NETHANGUP  32
-#define ISDN_TIMER_IPPP       64 
 #define ISDN_TIMER_KEEPALIVE 128 /* Cisco-Keepalive */
 #define ISDN_TIMER_CARRIER   256 /* Wait for Carrier */
 #define ISDN_TIMER_FAST      (ISDN_TIMER_MODEMREAD | ISDN_TIMER_MODEMPLUS | \
@@ -323,7 +322,7 @@ typedef struct {
 typedef struct isdn_net_local_s {
   ulong                  magic;
   char                   name[10];     /* Name of device                   */
-  struct net_device_stats stats;        /* Ethernet Statistics              */
+  struct net_device_stats stats;       /* Ethernet Statistics              */
   int                    isdn_device;  /* Index to isdn-device             */
   int                    isdn_channel; /* Index to isdn-channel            */
   int			 ppp_slot;     /* PPPD device slot number          */
@@ -421,8 +420,8 @@ typedef struct isdn_net_dev_s {
   void *next;                          /* Pointer to next isdn-interface   */
   struct net_device dev;               /* interface to upper levels        */
 #ifdef CONFIG_ISDN_PPP
-  struct mpqueue *mp_last; 
-  struct ippp_bundle ib;
+  ippp_bundle * pb;		/* pointer to the common bundle structure
+   			         * with the the per-bundle data */
 #endif
 #ifdef CONFIG_ISDN_X25
   struct concap_proto  *cprot; /* connection oriented encapsulation protocol */
@@ -690,5 +689,6 @@ extern isdn_dev *dev;
 /* Utility-Macros */
 #define MIN(a,b) ((a<b)?a:b)
 #define MAX(a,b) ((a>b)?a:b)
+
 #endif /* __KERNEL__ */
 #endif /* isdn_h */
diff --git a/include/linux/isdn_ppp.h b/include/linux/isdn_ppp.h
index 5536bd43a..732daa453 100644
--- a/include/linux/isdn_ppp.h
+++ b/include/linux/isdn_ppp.h
@@ -49,6 +49,8 @@ struct pppcallinfo
 #define MP_END_FRAG    0x40
 #define MP_BEGIN_FRAG  0x80
 
+#define MP_MAX_QUEUE_LEN	16
+
 #define ISDN_PPP_COMP_MAX_OPTIONS 16
 
 #define IPPP_COMP_FLAG_XMIT 0x1
@@ -131,35 +133,28 @@ extern int isdn_ppp_unregister_compressor(struct isdn_ppp_compressor *);
 extern int isdn_ppp_dial_slave(char *);
 extern int isdn_ppp_hangup_slave(char *);
 
-struct ippp_bundle {
+typedef struct {
+  unsigned long seqerrs;
+  unsigned long frame_drops;
+  unsigned long overflows;
+  unsigned long max_queue_len;
+} isdn_mppp_stats;
+
+typedef struct {
   int mp_mrru;                        /* unused                             */
-  struct mpqueue *last;               /* currently defined in isdn_net_dev  */
-  int min;                            /* currently calculated 'on the fly'  */
-  long next_num;                      /* we wanna see this seq.-number next */
-  struct sqqueue *sq;
-  int modify:1;                       /* set to 1 while modifying sqqueue   */
-  int bundled:1;                      /* bundle active ?                    */
-};
+  struct sk_buff * frags;	/* fragments sl list -- use skb->next */
+  long frames;			/* number of frames in the frame list */
+  unsigned int seq;		/* last processed packet seq #: any packets
+  				 * with smaller seq # will be dropped
+				 * unconditionally */
+  spinlock_t lock;
+  int ref_ct;				 
+  /* statistics */
+  isdn_mppp_stats stats;
+} ippp_bundle;
 
 #define NUM_RCV_BUFFS     64
 
-struct sqqueue {
-  struct sqqueue *next;
-  long sqno_start;
-  long sqno_end;
-  struct sk_buff *skb;
-  long timer;
-};
-
-struct mpqueue {
-  struct mpqueue *next;
-  struct mpqueue *last;
-  long sqno;
-  struct sk_buff *skb;
-  int BEbyte;
-  unsigned long time;
-};
-
 struct ippp_buf_queue {
   struct ippp_buf_queue *next;
   struct ippp_buf_queue *last;
@@ -214,9 +209,8 @@ struct ippp_struct {
   struct isdn_net_local_s *lp;
   int unit;
   int minor;
-  long last_link_seqno;
+  unsigned int last_link_seqno;
   long mp_seqno;
-  long range;
 #ifdef CONFIG_ISDN_PPP_VJ
   unsigned char *cbuf;
   struct slcompress *slcomp;
diff --git a/include/linux/isdnif.h b/include/linux/isdnif.h
index 8677f36c7..15ebaffcb 100644
--- a/include/linux/isdnif.h
+++ b/include/linux/isdnif.h
@@ -1,5 +1,5 @@
-/* $Id: isdnif.h,v 1.33 2000/01/20 19:59:43 keil Exp $
- *
+/* $Id: isdnif.h,v 1.35 2000/06/16 13:19:38 keil Exp $
+
  * Linux ISDN subsystem
  *
  * Definition of the interface between the subsystem and its low-level drivers.
@@ -135,6 +135,20 @@
 /* STAT_INVOKE_BRD callback. The ll_id is set to 0, the other fields */
 /* are supplied by the network and not by the HL.                    */   
 /*********************************************************************/
+
+/*****************/
+/* NI1 commands */ 
+/*****************/
+#define NI1_CMD_INVOKE       ((0x00 << 8) | ISDN_PTYPE_NI1)   /* invoke a supplementary service */
+#define NI1_CMD_INVOKE_ABORT ((0x01 << 8) | ISDN_PTYPE_NI1)   /* abort a invoke cmd */
+
+/*******************************/
+/* NI1 Status callback values */
+/*******************************/
+#define NI1_STAT_INVOKE_RES  ((0x80 << 8) | ISDN_PTYPE_NI1)   /* Result for invocation */
+#define NI1_STAT_INVOKE_ERR  ((0x81 << 8) | ISDN_PTYPE_NI1)   /* Error Return for invocation */
+#define NI1_STAT_INVOKE_BRD  ((0x82 << 8) | ISDN_PTYPE_NI1)   /* Deliver invoke broadcast info */
+
 typedef struct
   { ulong ll_id; /* ID supplied by LL when executing    */
 		 /* a command and returned by HL for    */
@@ -150,7 +164,7 @@ typedef struct
                  /* error value when error callback     */
     int datalen; /* length of cmd or stat data          */
     u_char *data;/* pointer to data delivered or send   */
-  } dss1_cmd_stat;
+  } isdn_cmd_stat;
 
 /*
  * Commands from linklevel to lowlevel
@@ -412,7 +426,7 @@ typedef struct {
 		setup_parm setup;/* For SETUP msg			*/
 		capi_msg cmsg;	/* For CAPI like messages		*/
 		char display[85];/* display message data		*/ 
-		dss1_cmd_stat dss1_io; /* DSS1 IO-parameter/result	*/
+		isdn_cmd_stat isdn_io; /* ISDN IO-parameter/result	*/
 		aux_s aux;	/* for modem commands/indications	*/
 #ifdef CONFIG_ISDN_TTY_FAX
 		T30_s	*fax;	/* Pointer to ttys fax struct		*/
@@ -420,6 +434,9 @@ typedef struct {
 	} parm;
 } isdn_ctrl;
 
+#define dss1_io    isdn_io
+#define ni1_io     isdn_io
+
 /*
  * The interface-struct itself (initialized at load-time of lowlevel-driver)
  *
diff --git a/include/linux/list.h b/include/linux/list.h
index 99ab9c44e..ed38faa21 100644
--- a/include/linux/list.h
+++ b/include/linux/list.h
@@ -94,7 +94,7 @@ static __inline__ void list_del(struct list_head *entry)
 
 /**
  * list_del_init - deletes entry from list and reinitialize it.
- * @entry: the element to delete from the list.n 
+ * @entry: the element to delete from the list.
  */
 static __inline__ void list_del_init(struct list_head *entry)
 {
diff --git a/include/linux/raid/linear.h b/include/linux/raid/linear.h
index 55cfab78f..80bf24767 100644
--- a/include/linux/raid/linear.h
+++ b/include/linux/raid/linear.h
@@ -5,8 +5,8 @@
 
 struct dev_info {
 	kdev_t		dev;
-	int		size;
-	unsigned int	offset;
+	unsigned long	size;
+	unsigned long	offset;
 };
 
 typedef struct dev_info dev_info_t;
diff --git a/include/linux/raid/raid0.h b/include/linux/raid/raid0.h
index 3ea74db60..a27234f67 100644
--- a/include/linux/raid/raid0.h
+++ b/include/linux/raid/raid0.h
@@ -5,9 +5,9 @@
 
 struct strip_zone
 {
-	int zone_offset;		/* Zone offset in md_dev */
-	int dev_offset;			/* Zone offset in real dev */
-	int size;			/* Zone size */
+	unsigned long zone_offset;	/* Zone offset in md_dev */
+	unsigned long dev_offset;	/* Zone offset in real dev */
+	unsigned long size;		/* Zone size */
 	int nb_dev;			/* # of devices attached to the zone */
 	mdk_rdev_t *dev[MAX_REAL]; /* Devices attached to the zone */
 };
diff --git a/include/linux/raid/raid1.h b/include/linux/raid/raid1.h
index ffa65d20d..aa17b8472 100644
--- a/include/linux/raid/raid1.h
+++ b/include/linux/raid/raid1.h
@@ -48,7 +48,7 @@ struct raid1_private_data {
 	md_wait_queue_head_t	wait_buffer;
 
 	/* for use when syncing mirrors: */
-	int	start_active, start_ready,
+	unsigned long	start_active, start_ready,
 		start_pending, start_future;
 	int	cnt_done, cnt_active, cnt_ready,
 		cnt_pending, cnt_future;
diff --git a/include/linux/raid/raid5.h b/include/linux/raid/raid5.h
index ab839ea02..dd5ad01ae 100644
--- a/include/linux/raid/raid5.h
+++ b/include/linux/raid/raid5.h
@@ -80,7 +80,6 @@ struct raid5_private_data {
 	int			buffer_size;
 	int			chunk_size, level, algorithm;
 	int			raid_disks, working_disks, failed_disks;
-	int			sector_count;
 	unsigned long		next_sector;
 	atomic_t		nr_handle;
 	struct stripe_head	*next_free_stripe;
diff --git a/include/linux/slab.h b/include/linux/slab.h
index 10da433df..76ccf2dbb 100644
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -11,6 +11,7 @@
 
 typedef struct kmem_cache_s kmem_cache_t;
 
+#include	<linux/config.h>
 #include	<linux/mm.h>
 #include	<linux/cache.h>