patch-2.1.22 linux/include/net/x25.h

Next file: linux/init/main.c
Previous file: linux/include/net/sock.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.21/linux/include/net/x25.h linux/include/net/x25.h
@@ -3,7 +3,7 @@
  *
  *	Jonathan Naylor		17/11/96
  */
- 
+
 #ifndef _X25_H
 #define _X25_H 
 #include <linux/x25.h>
@@ -25,7 +25,7 @@
 #define	X25_D_BIT			0x40
 #define	X25_STD_M_BIT			0x10
 #define	X25_EXT_M_BIT			0x01
- 
+
 #define	X25_CALL_REQUEST		0x0B
 #define	X25_CALL_ACCEPTED		0x0F
 #define	X25_CLEAR_REQUEST		0x13
@@ -95,6 +95,7 @@
 #define	X25_FAC_WINDOW_SIZE	0x43
 
 #define	X25_MAX_FAC_LEN		20		/* Plenty to spare */
+#define	X25_MAX_CUD_LEN		128
 
 struct x25_route {
 	struct x25_route	*next;
@@ -113,27 +114,21 @@
 	struct timer_list	timer;
 };
 
-struct x25_facilities {
-	int window_size;
-	int packet_size;
-	int throughput;
-	int reverse;
-};
-
 typedef struct {
 	x25_address		source_addr, dest_addr;
 	struct x25_neigh	*neighbour;
 	unsigned int		lci;
-	unsigned char		state, condition, qbitincl, intflg;
+	unsigned char		state, condition, qbitincl, intflag;
 	unsigned short		vs, vr, va, vl;
 	unsigned short		timer;
 	unsigned short		t2, t21, t22, t23;
 	unsigned short		fraglen;
-	struct sk_buff_head	ack_queue;
 	struct sk_buff_head	fragment_queue;
-	struct sk_buff_head	interrupt_queue;
+	struct sk_buff_head	interrupt_in_queue;
+	struct sk_buff_head	interrupt_out_queue;
 	struct sock		*sk;		/* Backlink to socket */
 	struct x25_facilities	facilities;
+	struct x25_calluserdata	calluserdata;
 } x25_cb;
 
 /* af_x25.c */
@@ -194,8 +189,6 @@
 
 /* x25_subr.c */
 extern void x25_clear_queues(struct sock *);
-extern void x25_frames_acked(struct sock *, unsigned short);
-extern void x25_requeue_frames(struct sock *);
 extern int  x25_validate_nr(struct sock *, unsigned short);
 extern void x25_write_internal(struct sock *, int);
 extern int  x25_decode(struct sock *, struct sk_buff *, int *, int *, int *, int *, int *);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov