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

• Lines: 116
• Date: Sun Jan 19 15:47:27 1997
• Orig file: v2.1.21/linux/include/net/rose.h
• Orig date: Sun Dec 22 16:37:42 1996

diff -u --recursive --new-file v2.1.21/linux/include/net/rose.h linux/include/net/rose.h
@@ -3,20 +3,22 @@
  *
  *	Jonathan Naylor G4KLX	25/8/96
  */
- 
+
 #ifndef _ROSE_H
 #define _ROSE_H 
 #include <linux/rose.h>
 
+#define	ROSE_SLOWHZ			10	/* Run timing at 1/10 second */
+
 #define	ROSE_ADDR_LEN			5
 
 #define	ROSE_MIN_LEN			3
 
-#define	GFI				0x10
-#define	Q_BIT				0x80
-#define	D_BIT				0x40
-#define	M_BIT				0x10
- 
+#define	ROSE_GFI			0x10
+#define	ROSE_Q_BIT			0x80
+#define	ROSE_D_BIT			0x40
+#define	ROSE_M_BIT			0x10
+
 #define	ROSE_CALL_REQUEST		0x0B
 #define	ROSE_CALL_ACCEPTED		0x0F
 #define	ROSE_CLEAR_REQUEST		0x13
@@ -38,33 +40,37 @@
 
 /* Define Link State constants. */
 
-#define ROSE_STATE_0		0		/* Ready */
-#define ROSE_STATE_1		1		/* Awaiting Call Accepted */
-#define ROSE_STATE_2		2		/* Awaiting Clear Confirmation */
-#define ROSE_STATE_3		3		/* Data Transfer */
-#define	ROSE_STATE_4		4		/* Awaiting Reset Confirmation */
-
-#define ROSE_DEFAULT_T0		(180 * PR_SLOWHZ)	/* Default T10 T20 value */
-#define ROSE_DEFAULT_T1		(200 * PR_SLOWHZ)	/* Default T11 T21 value */
-#define ROSE_DEFAULT_T2		(180 * PR_SLOWHZ)	/* Default T12 T22 value */
-#define	ROSE_DEFAULT_T3		(180 * PR_SLOWHZ)	/* Default T13 T23 value */
-#define	ROSE_DEFAULT_HB		(5 * PR_SLOWHZ)		/* Default Holdback value */
-#define	ROSE_DEFAULT_IDLE	(20 * 60 * PR_SLOWHZ)	/* Default No Activity value */
-#define	ROSE_DEFAULT_WINDOW	2			/* Default Window Size	*/
-#define ROSE_MODULUS 		8
-#define ROSE_MAX_WINDOW_SIZE	7			/* Maximum Window Allowable */
-#define	ROSE_PACLEN		128			/* Default Packet Length */
-
-#define	FAC_NATIONAL		0x00
-#define	FAC_CCITT		0x0F
-
-#define	FAC_NATIONAL_RAND	0x7F
-#define	FAC_NATIONAL_FLAGS	0x3F
-#define	FAC_NATIONAL_DEST_DIGI	0xE9
-#define	FAC_NATIONAL_SRC_DIGI	0xEB
+#define ROSE_STATE_0			0		/* Ready */
+#define ROSE_STATE_1			1		/* Awaiting Call Accepted */
+#define ROSE_STATE_2			2		/* Awaiting Clear Confirmation */
+#define ROSE_STATE_3			3		/* Data Transfer */
+#define	ROSE_STATE_4			4		/* Awaiting Reset Confirmation */
+
+#define ROSE_DEFAULT_T0			(180 * ROSE_SLOWHZ)	/* Default T10 T20 value */
+#define ROSE_DEFAULT_T1			(200 * ROSE_SLOWHZ)	/* Default T11 T21 value */
+#define ROSE_DEFAULT_T2			(180 * ROSE_SLOWHZ)	/* Default T12 T22 value */
+#define	ROSE_DEFAULT_T3			(180 * ROSE_SLOWHZ)	/* Default T13 T23 value */
+#define	ROSE_DEFAULT_HB			(5 * ROSE_SLOWHZ)	/* Default Holdback value */
+#define	ROSE_DEFAULT_IDLE		(20 * 60 * ROSE_SLOWHZ)	/* Default No Activity value */
+#define	ROSE_DEFAULT_WINDOW		2			/* Default Window Size	*/
+#define ROSE_MODULUS 			8
+#define ROSE_MAX_WINDOW_SIZE		7			/* Maximum Window Allowable */
+#define	ROSE_PACLEN			128			/* Default Packet Length */
+
+#define	ROSE_COND_ACK_PENDING		0x01
+#define	ROSE_COND_PEER_RX_BUSY		0x02
+#define	ROSE_COND_OWN_RX_BUSY		0x04
+
+#define	FAC_NATIONAL			0x00
+#define	FAC_CCITT			0x0F
+
+#define	FAC_NATIONAL_RAND		0x7F
+#define	FAC_NATIONAL_FLAGS		0x3F
+#define	FAC_NATIONAL_DEST_DIGI		0xE9
+#define	FAC_NATIONAL_SRC_DIGI		0xEB
 
-#define	FAC_CCITT_DEST_NSAP	0xC9
-#define	FAC_CCITT_SRC_NSAP	0xCB
+#define	FAC_CCITT_DEST_NSAP		0xC9
+#define	FAC_CCITT_SRC_NSAP		0xCB
 
 struct rose_neigh {
 	struct rose_neigh *next;
@@ -108,12 +114,12 @@
 	unsigned short		timer;
 	unsigned short		t1, t2, t3, hb, idle;
 	unsigned short		fraglen;
-	struct sk_buff_head	ack_queue;
 	struct sk_buff_head	frag_queue;
 	struct sock		*sk;		/* Backlink to socket */
 } rose_cb;
 
 /* af_rose.c */
+extern ax25_address rose_callsign;
 extern int  sysctl_rose_restart_request_timeout;
 extern int  sysctl_rose_call_request_timeout;
 extern int  sysctl_rose_reset_request_timeout;
@@ -169,8 +175,6 @@
 
 /* rose_subr.c */
 extern void rose_clear_queues(struct sock *);
-extern void rose_frames_acked(struct sock *, unsigned short);
-extern void rose_requeue_frames(struct sock *);
 extern int  rose_validate_nr(struct sock *, unsigned short);
 extern void rose_write_internal(struct sock *, int);
 extern int  rose_decode(struct sk_buff *, int *, int *, int *, int *, int *);