Import of Linux/MIPS 2.1.14

1 files changed, 144 insertions, 39 deletions

diff --git a/include/net/ax25.h b/include/net/ax25.h
index 4195c1246..43cedaafb 100644
--- a/include/net/ax25.h
+++ b/include/net/ax25.h
@@ -7,17 +7,39 @@
 #ifndef _AX25_H
 #define _AX25_H 
 #include <linux/ax25.h>
+
+#define PR_SLOWHZ	10		/*  Run timing at 1/10 second - gives us better resolution for 56kbit links */
+
+#define	AX25_T1CLAMPLO  (1 * PR_SLOWHZ)	/* If defined, clamp at 1 second **/
+#define	AX25_T1CLAMPHI (30 * PR_SLOWHZ)	/* If defined, clamp at 30 seconds **/
+
+#define	AX25_BROKEN_NETMAC
+
+#define	AX25_BPQ_HEADER_LEN	16
+#define	AX25_KISS_HEADER_LEN	1
+
+#define	AX25_HEADER_LEN		17
+#define	AX25_ADDR_LEN		7
+#define	AX25_DIGI_HEADER_LEN	(AX25_MAX_DIGIS * AX25_ADDR_LEN)
+#define	AX25_MAX_HEADER_LEN	(AX25_HEADER_LEN + AX25_DIGI_HEADER_LEN)
  
+#define AX25_P_ROSE	0x01
 #define AX25_P_IP	0xCC
 #define AX25_P_ARP	0xCD
 #define AX25_P_TEXT 	0xF0
 #define AX25_P_NETROM 	0xCF
+#define	AX25_P_SEGMENT	0x08
+
+#define	SEG_REM		0x7F
+#define	SEG_FIRST	0x80
 
-#define LAPB_UI	0x03
-#define LAPB_C	0x80
-#define LAPB_E	0x01
+#define LAPB_UI		0x03
+#define LAPB_C		0x80
+#define LAPB_E		0x01
 
-#define SSID_SPARE	0x60		/* Unused bits (DAMA bit and spare must be 1) */
+#define SSSID_SPARE	0x60	/* Unused bits in SSID for standard AX.25 */
+#define ESSID_SPARE	0x20	/* Unused bits in SSID for extended AX.25 */
+#define DAMA_FLAG	0x20	/* Well, it is *NOT* unused! (dl1bke 951121 */
 
 #define AX25_REPEATED	0x80
 
@@ -67,11 +89,13 @@
 #define	UA	0x63	/* Unnumbered acknowledge */
 #define	FRMR	0x87	/* Frame reject */
 #define	UI	0x03	/* Unnumbered information */
-#define	PF	0x10	/* Poll/final bit */
+#define	PF	0x10	/* Poll/final bit for standard AX.25 */
+#define	EPF	0x01	/* Poll/final bit for extended AX.25 */
 
 #define ILLEGAL	0x100	/* Impossible to be a real frame type */
 
-#define	MMASK	7	/* Mask for modulo-8 sequence numbers */
+#define	POLLOFF		0
+#define	POLLON		1
 
 /* AX25 L2 C-bit */
 
@@ -86,14 +110,46 @@
 #define AX25_STATE_3	3
 #define AX25_STATE_4	4
 
-#define PR_SLOWHZ	10			/*  Run timing at 1/10 second - gives us better resolution for 56kbit links */
-#define DEFAULT_T1	(10  * PR_SLOWHZ)	/*  Outstanding frames - 10 seconds */
-#define DEFAULT_T2	(3   * PR_SLOWHZ)	/*  Response delay     - 3 seconds */
-#define DEFAULT_T3	(300 * PR_SLOWHZ)	/*  Idle supervision   - 300 seconds */
-#define DEFAULT_N2	10			/*  Number of retries */
-#define	DEFAULT_WINDOW	2			/*  Default window size	*/
-#define MODULUS 	8
-#define MAX_WINDOW_SIZE 7			/*  Maximum window allowable */
+#define	AX25_MAX_DEVICES	20	/* Max No of AX.25 devices */
+
+#define MODULUS 		8	/*  Standard AX.25 modulus */
+#define	EMODULUS		128	/*  Extended AX.25 modulus */
+
+#define	AX25_DIGI_INBAND	0x01	/* Allow digipeating within port **/
+#define	AX25_DIGI_XBAND		0x02	/* Allow digipeating across ports **/
+
+#define	AX25_VALUES_IPDEFMODE	0	/* 0=DG 1=VC */
+#define	AX25_VALUES_AXDEFMODE	1	/* 0=Normal 1=Extended Seq Nos */
+#define	AX25_VALUES_TEXT	2	/* Allow PID=Text - 0=No 1=Yes */
+#define	AX25_VALUES_BACKOFF	3	/* 0=Linear 1=Exponential */
+#define	AX25_VALUES_CONMODE	4	/* Allow connected modes - 0=No 1=Yes */
+#define	AX25_VALUES_WINDOW	5	/* Default window size for standard AX.25 */
+#define	AX25_VALUES_EWINDOW	6	/* Default window size for extended AX.25 */
+#define	AX25_VALUES_T1		7	/* Default T1 timeout value */
+#define	AX25_VALUES_T2		8	/* Default T2 timeout value */
+#define	AX25_VALUES_T3		9	/* Default T3 timeout value */
+#define AX25_VALUES_IDLE	10	/* mode vc idle timer */
+#define	AX25_VALUES_N2		11	/* Default N2 value */
+#define AX25_VALUES_PACLEN	12	/* AX.25 MTU */
+#define AX25_VALUES_MAXQUEUE	13	/* Maximum number of buffers enqueued */
+#define	AX25_VALUES_DIGI	14	/* Digipeat mode */
+#define	AX25_MAX_VALUES		15
+
+#define	AX25_DEF_IPDEFMODE	0			/* Datagram */
+#define	AX25_DEF_AXDEFMODE	0			/* Normal */
+#define	AX25_DEF_TEXT		1			/* PID=Text allowed */
+#define	AX25_DEF_BACKOFF	1			/* Exponential backoff */
+#define	AX25_DEF_CONMODE	1			/* Connected mode allowed */
+#define	AX25_DEF_WINDOW		2			/* Window=2 */
+#define	AX25_DEF_EWINDOW	32			/* Module-128 Window=32 */
+#define	AX25_DEF_T1		(10 * PR_SLOWHZ)	/* T1=10s */
+#define	AX25_DEF_T2		(3 * PR_SLOWHZ)		/* T2=3s  */
+#define	AX25_DEF_T3		(300 * PR_SLOWHZ)	/* T3=300s */
+#define	AX25_DEF_N2		10			/* N2=10 */
+#define AX25_DEF_IDLE		(20 * 60 * PR_SLOWHZ)	/* Idle=20 mins */		
+#define AX25_DEF_PACLEN		256			/* Paclen=256 */
+#define AX25_DEF_MAXQUEUE	2			/* 1 * ax25->window */
+#define	AX25_DEF_DIGI		0x03			/* All digis alowed */
 
 typedef struct ax25_uid_assoc {
 	struct ax25_uid_assoc *next;
@@ -102,8 +158,8 @@ typedef struct ax25_uid_assoc {
 } ax25_uid_assoc;
 
 typedef struct {
-	ax25_address calls[6];
-	unsigned char repeated[6];
+	ax25_address calls[AX25_MAX_DIGIS];
+	unsigned char repeated[AX25_MAX_DIGIS];
 	unsigned char ndigi;
 	char lastrepeat;
 } ax25_digi;
@@ -112,77 +168,126 @@ typedef struct ax25_cb {
 	struct ax25_cb		*next;
 	ax25_address		source_addr, dest_addr;
 	struct device		*device;
-	unsigned char		state;
+	unsigned char		dama_slave;	/* dl1bke 951121 */
+	unsigned char		state, modulus, hdrincl;
 	unsigned short		vs, vr, va;
-	unsigned char		condition;
+	unsigned char		condition, backoff;
 	unsigned char		n2, n2count;
-	unsigned short		t1, t2, t3, rtt;
-	unsigned short		t1timer, t2timer, t3timer;
+	unsigned short		t1, t2, t3, idle, rtt;
+	unsigned short		t1timer, t2timer, t3timer, idletimer;
+	unsigned short		paclen;
+	unsigned short		maxqueue;
+	unsigned short		fragno, fraglen;
 	ax25_digi		*digipeat;
 	struct sk_buff_head	write_queue;
+	struct sk_buff_head	reseq_queue;
 	struct sk_buff_head	ack_queue;
+	struct sk_buff_head	frag_queue;
 	unsigned char		window;
 	struct timer_list	timer;
 	struct sock		*sk;		/* Backlink to socket */
 } ax25_cb;
 
-/* ax25.c */
+struct ax25_dev {
+	char name[20];
+	struct device *dev;
+	int values[AX25_MAX_VALUES];
+};
+
+/* af_ax25.c */
+extern ax25_address null_ax25_address;
 extern char *ax2asc(ax25_address *);
+extern ax25_address *asc2ax(char *);
 extern int  ax25cmp(ax25_address *, ax25_address *);
-extern int  ax25_send_frame(struct sk_buff *, ax25_address *, ax25_address *, struct device *);
-extern int  ax25_rcv(struct sk_buff *,struct device *,struct packet_type *);
+extern int  ax25_send_frame(struct sk_buff *, ax25_address *, ax25_address *, ax25_digi *, struct device *);
+extern int  ax25_link_up(ax25_address *, ax25_address *, struct device *);
 extern void ax25_destroy_socket(ax25_cb *);
 extern struct device *ax25rtr_get_dev(ax25_address *);
-extern int  ax25_encapsulate(unsigned char *, struct device *, unsigned short,
-	void *, void *, unsigned int, struct sk_buff *);
+extern int  ax25_encapsulate(struct sk_buff *, struct device *, unsigned short,
+	void *, void *, unsigned int);
 extern int  ax25_rebuild_header(unsigned char *, struct device *, unsigned long, struct sk_buff *);
-extern int  ax25_get_info(char *, char **, off_t, int);
 extern ax25_uid_assoc *ax25_uid_list;
 extern int  ax25_uid_policy;
 extern ax25_address *ax25_findbyuid(uid_t);
+extern void ax25_queue_xmit(struct sk_buff *, struct device *, int);
+extern int  ax25_dev_is_dama_slave(struct device *);	/* dl1bke 951121 */
 
-#include "ax25call.h"
+#include <net/ax25call.h>
 
 /* ax25_in.c */
-extern int  ax25_process_rx_frame(ax25_cb *, struct sk_buff *, int);
+extern int  ax25_process_rx_frame(ax25_cb *, struct sk_buff *, int, int);
 
 /* ax25_out.c */
-extern int  ax25_output(ax25_cb *, struct sk_buff *);
+extern void ax25_output(ax25_cb *, struct sk_buff *);
 extern void ax25_kick(ax25_cb *);
 extern void ax25_transmit_buffer(ax25_cb *, struct sk_buff *, int);
 extern void ax25_nr_error_recovery(ax25_cb *);
 extern void ax25_establish_data_link(ax25_cb *);
 extern void ax25_transmit_enquiry(ax25_cb *);
 extern void ax25_enquiry_response(ax25_cb *);
+extern void ax25_timeout_response(ax25_cb *);
 extern void ax25_check_iframes_acked(ax25_cb *, unsigned short);
 extern void ax25_check_need_response(ax25_cb *, int, int);
+extern void dama_enquiry_response(ax25_cb *);			/* dl1bke 960114 */
+extern void dama_check_need_response(ax25_cb *, int, int);	/* dl1bke 960114 */
+extern void dama_establish_data_link(ax25_cb *);
 
 /* ax25_route.c */
-extern void ax25_rt_rx_frame(ax25_address *, struct device *);
-extern int  ax25_rt_get_info(char *, char **, off_t, int);
-extern int  ax25_cs_get_info(char *, char **, off_t, int);
+extern struct ax25_dev ax25_device[];
+extern int  ax25_rt_get_info(char *, char **, off_t, int, int);
+extern int  ax25_cs_get_info(char *, char **, off_t, int, int);
 extern int  ax25_rt_autobind(ax25_cb *, ax25_address *);
+extern void ax25_rt_build_path(ax25_cb *, ax25_address *, struct device *);
+extern void ax25_dg_build_path(struct sk_buff *, ax25_address *, struct device *);
 extern void ax25_rt_device_down(struct device *);
-extern void ax25_ip_mode_set(ax25_address *, struct device *, char);
+extern int  ax25_rt_ioctl(unsigned int, void *);
 extern char ax25_ip_mode_get(ax25_address *, struct device *);
+extern int  ax25_dev_get_value(struct device *, int);
+extern void ax25_dev_device_up(struct device *);
+extern void ax25_dev_device_down(struct device *);
+extern void ax25_rt_free(void);
 
 /* ax25_subr.c */
-extern void ax25_clear_tx_queue(ax25_cb *);
+extern void ax25_clear_queues(ax25_cb *);
 extern void ax25_frames_acked(ax25_cb *, unsigned short);
+extern void ax25_requeue_frames(ax25_cb *);
 extern int  ax25_validate_nr(ax25_cb *, unsigned short);
-extern int  ax25_decode(unsigned char *);
-extern void ax25_send_control(ax25_cb *, int, int);
+extern int  ax25_decode(ax25_cb *, struct sk_buff *, int *, int *, int *);
+extern void ax25_send_control(ax25_cb *, int, int, int);
 extern unsigned short ax25_calculate_t1(ax25_cb *);
 extern void ax25_calculate_rtt(ax25_cb *);
 extern unsigned char *ax25_parse_addr(unsigned char *, int, ax25_address *,
-	ax25_address *, ax25_digi *, int *);
+	ax25_address *, ax25_digi *, int *, int *);	/* dl1bke 951121 */
 extern int  build_ax25_addr(unsigned char *, ax25_address *, ax25_address *,
-	ax25_digi *, int);
+	ax25_digi *, int, int);
 extern int  size_ax25_addr(ax25_digi *);
 extern void ax25_digi_invert(ax25_digi *, ax25_digi *);
 extern void ax25_return_dm(struct device *, ax25_address *, ax25_address *, ax25_digi *);
+extern int  ax25_queue_length(ax25_cb *, struct sk_buff *); /* dl1bke 960327 */
+extern void ax25_dama_on(ax25_cb *);	/* dl1bke 951121 */
+extern void ax25_dama_off(ax25_cb *);	/* dl1bke 951121 */
 
-/* ax25_timer */
+/* ax25_timer.c */
 extern void ax25_set_timer(ax25_cb *);
+extern void ax25_t1_timeout(ax25_cb *);
+extern void ax25_link_failed(ax25_address *, struct device *);
+extern int  (*ax25_protocol_function(unsigned int))(struct sk_buff *, ax25_cb *);
+extern int  ax25_listen_mine(ax25_address *, struct device *);
+
+/* sysctl_net_ax25.c */
+extern void ax25_register_sysctl(void);
+extern void ax25_unregister_sysctl(void);
+
+/* ... */
+
+extern ax25_cb *volatile ax25_list;
+
+/* support routines for modules that use AX.25, in ax25_timer.c */
+extern int  ax25_protocol_register(unsigned int, int (*)(struct sk_buff *, ax25_cb *));
+extern void ax25_protocol_release(unsigned int);
+extern int  ax25_linkfail_register(void (*)(ax25_address *, struct device *));
+extern void ax25_linkfail_release(void (*)(ax25_address *, struct device *));
+extern int  ax25_listen_register(ax25_address *, struct device *);
+extern void ax25_listen_release(ax25_address *, struct device *);
 
 #endif