summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
Diffstat (limited to 'include/net')
-rw-r--r--include/net/ax25.h381
-rw-r--r--include/net/ax25_uid.h33
-rw-r--r--include/net/ax25call.h2
-rw-r--r--include/net/ax25dev.h164
-rw-r--r--include/net/netrom.h3
-rw-r--r--include/net/rose.h3
6 files changed, 336 insertions, 250 deletions
diff --git a/include/net/ax25.h b/include/net/ax25.h
index 0957d1aae..fc0509a3f 100644
--- a/include/net/ax25.h
+++ b/include/net/ax25.h
@@ -6,19 +6,27 @@
#ifndef _AX25_H
#define _AX25_H
-#include <linux/config.h>
#include <linux/ax25.h>
-#define AX25_T1CLAMPLO 1
-#define AX25_T1CLAMPHI (30 * HZ)
+#define AX25_TICS (HZ/10) /* AX25 timertic is 1/10 sec (100 ms) */
+#define AX25_SLOWHZ 10 /* 10 timertics, 1 second */
+
+#define AX25_T1CLAMPLO AX25_SLOWHZ /* 1 sec */
+#define AX25_T1CLAMPHI (30 * AX25_SLOWHZ) /* 30 secs */
#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_MIN_HEADER_LEN (AX25_ADDR_LEN*2+1) /* Source, Destination, Control */
+#define AX25_MAX_HEADER_LEN (AX25_MIN_HEADER_LEN+1+AX25_ADDR_LEN*AX25_MAX_DIGIS) /* ... including Digipeaters */
+
+/*
+ * these are obsolete
+ *
+ * #define AX25_KISS_HEADER_LEN 1
+ * #define AX25_HEADER_LEN 17
+ * #define AX25_DIGI_HEADER_LEN (AX25_MAX_DIGIS * AX25_ADDR_LEN)
+ */
/* AX.25 Protocol IDs */
#define AX25_P_ROSE 0x01
@@ -27,6 +35,8 @@
#define AX25_P_TEXT 0xF0
#define AX25_P_NETROM 0xCF
#define AX25_P_SEGMENT 0x08
+#define AX25_P_VJCOMP 0x06 /* Matthias Welwarsky (DG2FEF) */
+#define AX25_P_VJUNCOMP 0x07 /* Matthias Welwarsky (DG2FEF) */
/* AX.25 Segment control values */
#define AX25_SEG_REM 0x7F
@@ -38,18 +48,45 @@
#define AX25_SSSID_SPARE 0x60 /* Unused bits in SSID for standard AX.25 */
#define AX25_ESSID_SPARE 0x20 /* Unused bits in SSID for extended AX.25 */
-#define AX25_DAMA_FLAG 0x20 /* Well, it is *NOT* unused! (dl1bke 951121 */
+#define AX25_DAMA_FLAG 0x20 /* Well, it is *NOT* unused! (dl1bke 951121) */
#define AX25_COND_ACK_PENDING 0x01
#define AX25_COND_REJECT 0x02
#define AX25_COND_PEER_RX_BUSY 0x04
#define AX25_COND_OWN_RX_BUSY 0x08
-#define AX25_COND_DAMA_MODE 0x10
+#define AX25_COND_STATE_CHANGE 0x10
+#define AX25_COND_RELEASE 0x20
+#define AX25_COND_SETUP 0x40
+#define AX25_COND_START_T1 0x80
+
+#define AX25_SCHED_IDLE 0
+#define AX25_SCHED_READY 1
#ifndef _LINUX_NETDEVICE_H
#include <linux/netdevice.h>
#endif
+/*
+ * These headers are taken from the KA9Q package by Phil Karn. These specific
+ * files have been placed under the GPL (not the whole package) by Phil.
+ *
+ *
+ * Copyright 1991 Phil Karn, KA9Q
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 dated June, 1991.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave., Cambridge, MA 02139, USA.
+ */
+
/* Upper sub-layer (LAPB) definitions */
/* Control field templates */
@@ -81,270 +118,122 @@
/* Define Link State constants. */
-enum {
- AX25_STATE_0,
+enum {
+ AX25_STATE_0 = 0,
AX25_STATE_1,
AX25_STATE_2,
AX25_STATE_3,
- AX25_STATE_4
-};
-
-#define AX25_MODULUS 8 /* Standard AX.25 modulus */
-#define AX25_EMODULUS 128 /* Extended AX.25 modulus */
-
-enum {
- AX25_PROTO_STD_SIMPLEX,
- AX25_PROTO_STD_DUPLEX,
- AX25_PROTO_DAMA_SLAVE,
- AX25_PROTO_DAMA_MASTER
+ AX25_STATE_4,
+ AX25_LISTEN
};
-enum {
- AX25_VALUES_IPDEFMODE, /* 0=DG 1=VC */
- AX25_VALUES_AXDEFMODE, /* 0=Normal 1=Extended Seq Nos */
- AX25_VALUES_BACKOFF, /* 0=None 1=Linear 2=Exponential */
- AX25_VALUES_CONMODE, /* Allow connected modes - 0=No 1=no "PID text" 2=all PIDs */
- AX25_VALUES_WINDOW, /* Default window size for standard AX.25 */
- AX25_VALUES_EWINDOW, /* Default window size for extended AX.25 */
- AX25_VALUES_T1, /* Default T1 timeout value */
- AX25_VALUES_T2, /* Default T2 timeout value */
- AX25_VALUES_T3, /* Default T3 timeout value */
- AX25_VALUES_IDLE, /* Connected mode idle timer */
- AX25_VALUES_N2, /* Default N2 value */
- AX25_VALUES_PACLEN, /* AX.25 MTU */
- AX25_VALUES_PROTOCOL, /* Std AX.25, DAMA Slave, DAMA Master */
- AX25_VALUES_DS_TIMEOUT, /* DAMA Slave timeout */
- AX25_MAX_VALUES /* THIS MUST REMAIN THE LAST ENTRY OF THIS LIST */
-};
+typedef enum {
+ AX25_SEQMASK = 7,
+ AX25_ESEQMASK = 127
+} ax25_seqmask_t;
-#define AX25_DEF_IPDEFMODE 0 /* Datagram */
-#define AX25_DEF_AXDEFMODE 0 /* Normal */
-#define AX25_DEF_BACKOFF 1 /* Linear backoff */
-#define AX25_DEF_CONMODE 2 /* Connected mode allowed */
-#define AX25_DEF_WINDOW 2 /* Window=2 */
-#define AX25_DEF_EWINDOW 32 /* Module-128 Window=32 */
-#define AX25_DEF_T1 (10 * HZ) /* T1=10s */
-#define AX25_DEF_T2 (3 * HZ) /* T2=3s */
-#define AX25_DEF_T3 (300 * HZ) /* T3=300s */
-#define AX25_DEF_N2 10 /* N2=10 */
-#define AX25_DEF_IDLE (0 * 60 * HZ) /* Idle=None */
-#define AX25_DEF_PACLEN 256 /* Paclen=256 */
-#define AX25_DEF_PROTOCOL AX25_PROTO_STD_SIMPLEX /* Standard AX.25 */
-#define AX25_DEF_DS_TIMEOUT (3 * 60 * HZ) /* DAMA timeout 3 minutes */
-
-typedef struct ax25_uid_assoc {
- struct ax25_uid_assoc *next;
- uid_t uid;
- ax25_address call;
-} ax25_uid_assoc;
+#ifndef _AX25_VJ_H
+struct axvj_slcomp;
+#endif
typedef struct {
- ax25_address calls[AX25_MAX_DIGIS];
- unsigned char repeated[AX25_MAX_DIGIS];
- unsigned char ndigi;
- char lastrepeat;
-} ax25_digi;
-
-typedef struct ax25_route {
- struct ax25_route *next;
- ax25_address callsign;
- struct net_device *dev;
- ax25_digi *digipeat;
- char ip_mode;
-} ax25_route;
-
-typedef struct {
- char slave; /* slave_mode? */
- struct timer_list slave_timer; /* timeout timer */
- unsigned short slave_timeout; /* when? */
-} ax25_dama_info;
-
-struct ctl_table;
-
-typedef struct ax25_dev {
- struct ax25_dev *next;
- struct net_device *dev;
- struct net_device *forward;
- struct ctl_table *systable;
- int values[AX25_MAX_VALUES];
-#if defined(CONFIG_AX25_DAMA_SLAVE) || defined(CONFIG_AX25_DAMA_MASTER)
- ax25_dama_info dama;
-#endif
-} ax25_dev;
+ unsigned int csum;
+ struct sk_buff *skb;
+} ax25_reseq_t;
typedef struct ax25_cb {
+ struct ax25_cb *prev; /* doubly linked list now */
struct ax25_cb *next;
- ax25_address source_addr, dest_addr;
- ax25_digi *digipeat;
- ax25_dev *ax25_dev;
- unsigned char iamdigi;
- unsigned char state, modulus, pidincl;
- unsigned short vs, vr, va;
- unsigned char condition, backoff;
+ struct ax25_cb *peer; /* for FlexNet style digipeating */
+ struct net_device *device; /* backlink to device structure */
+ int inserted; /* Socket is on a list */
+ struct sock *sk; /* Backlink to socket */
+
+ /* used by the DDI layer */
+ struct {
+ int state;
+ struct ax25_cb *prev;
+ struct ax25_cb *next;
+ } ready;
+
+ unsigned short tx_cmd, tx_rsp;
+
+ /* layer II values
+ *
+ * vs = sequence number assigned to next to be transmitted I frame
+ * va = sequence number of first I frame our peer has not acked yet
+ * vr = sequence number of next frame we expect to receive from peer
+ * vl = last frame we ack'ed yet
+ */
+ ax25_addr_t addr;
+ unsigned char state, condition;
+ unsigned short vs, vr, va, vs_max, vl, window;
+ ax25_seqmask_t seqmask;
+ unsigned long rtt_timestamp;
+ short rtt, vs_rtt;
unsigned char n2, n2count;
- struct timer_list t1timer, t2timer, t3timer, idletimer;
- unsigned long t1, t2, t3, idle, rtt;
+ unsigned short t1, t2, t3, idle;
+ unsigned short wrt_timer, ack_timer, idletimer, killtimer;
unsigned short paclen, fragno, fraglen;
+ unsigned char iamdigi, pidincl, backoff;
struct sk_buff_head write_queue;
- struct sk_buff_head reseq_queue;
+ struct sk_buff_head rcv_queue; /* MW: for flow control handling */
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 */
+ struct axvj_slcomp *slcomp; /* MW: for VJ Compression */
+ unsigned char slcomp_enable; /* MW: dito. */
+ ax25_reseq_t reseq[AX25_SEQMASK+1]; /* MW: resequencer, not for EMODULUS */
+ rwlock_t timer_lock;
} ax25_cb;
-/* af_ax25.c */
-extern ax25_cb *volatile ax25_list;
-extern void ax25_free_cb(ax25_cb *);
-extern void ax25_insert_socket(ax25_cb *);
-struct sock *ax25_find_listener(ax25_address *, int, struct net_device *, int);
-struct sock *ax25_find_socket(ax25_address *, ax25_address *, int);
-extern ax25_cb *ax25_find_cb(ax25_address *, ax25_address *, ax25_digi *, struct net_device *);
-extern struct sock *ax25_addr_match(ax25_address *);
-extern void ax25_send_to_raw(struct sock *, struct sk_buff *, int);
-extern void ax25_destroy_socket(ax25_cb *);
-extern ax25_cb *ax25_create_cb(void);
-extern void ax25_fillin_cb(ax25_cb *, ax25_dev *);
-extern int ax25_create(struct socket *, int);
-extern struct sock *ax25_make_new(struct sock *, struct ax25_dev *);
-
-/* ax25_addr.c */
+typedef struct {
+ ax25_addr_t addr;
+ unsigned short frametype;
+ unsigned short nr;
+ unsigned short ns;
+ unsigned char pf;
+ unsigned char cmdrsp;
+ unsigned char dama;
+} ax25_pktinfo;
+
+#define DAMA_STATE(ax25_cb) (AX25_PTR(ax25_cb->device)->dama_mode)
+
+/* needed by netrom/rose */
+extern __inline__ unsigned long ax25_display_timer(struct timer_list *timer)
+{
+ if (!timer_pending(timer))
+ return 0;
+ return timer->expires - jiffies;
+}
+
+#include <net/ax25call.h>
+
+extern ax25_address* asc2ax(char *);
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 ax25digicmp(ax25_digi *, ax25_digi *);
-extern unsigned char *ax25_addr_parse(unsigned char *, int, ax25_address *, ax25_address *, ax25_digi *, int *, int *);
-extern int ax25_addr_build(unsigned char *, ax25_address *, ax25_address *, ax25_digi *, int, int);
-extern int ax25_addr_size(ax25_digi *);
-extern void ax25_digi_invert(ax25_digi *, ax25_digi *);
-
-/* ax25_dev.c */
-extern ax25_dev *ax25_dev_list;
-extern ax25_dev *ax25_dev_ax25dev(struct net_device *);
-extern ax25_dev *ax25_addr_ax25dev(ax25_address *);
-extern void ax25_dev_device_up(struct net_device *);
-extern void ax25_dev_device_down(struct net_device *);
-extern int ax25_fwd_ioctl(unsigned int, struct ax25_fwd_struct *);
-extern struct net_device *ax25_fwd_dev(struct net_device *);
-extern void ax25_dev_free(void);
-
-/* ax25_ds_in.c */
-extern int ax25_ds_frame_in(ax25_cb *, struct sk_buff *, int);
-
-/* ax25_ds_subr.c */
-extern void ax25_ds_nr_error_recovery(ax25_cb *);
-extern void ax25_ds_enquiry_response(ax25_cb *);
-extern void ax25_ds_establish_data_link(ax25_cb *);
-extern void ax25_dev_dama_on(ax25_dev *);
-extern void ax25_dev_dama_off(ax25_dev *);
-extern void ax25_dama_on(ax25_cb *);
-extern void ax25_dama_off(ax25_cb *);
-
-/* ax25_ds_timer.c */
-extern void ax25_ds_set_timer(ax25_dev *);
-extern void ax25_ds_del_timer(ax25_dev *);
-extern void ax25_ds_timer(ax25_cb *);
-extern void ax25_ds_t1_timeout(ax25_cb *);
-extern void ax25_ds_heartbeat_expiry(ax25_cb *);
-extern void ax25_ds_t3timer_expiry(ax25_cb *);
-extern void ax25_ds_idletimer_expiry(ax25_cb *);
-
-/* ax25_iface.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_cb *, int));
-extern void ax25_linkfail_release(void (*)(ax25_cb *, int));
-extern int ax25_listen_register(ax25_address *, struct net_device *);
-extern void ax25_listen_release(ax25_address *, struct net_device *);
-extern int (*ax25_protocol_function(unsigned int))(struct sk_buff *, ax25_cb *);
-extern int ax25_listen_mine(ax25_address *, struct net_device *);
-extern void ax25_link_failed(ax25_cb *, int);
-extern int ax25_protocol_is_registered(unsigned int);
-
-/* ax25_in.c */
-extern int ax25_rx_iframe(ax25_cb *, struct sk_buff *);
-extern int ax25_kiss_rcv(struct sk_buff *, struct net_device *, struct packet_type *);
-
-/* ax25_ip.c */
-extern int ax25_encapsulate(struct sk_buff *, struct net_device *, unsigned short, void *, void *, unsigned int);
-extern int ax25_rebuild_header(struct sk_buff *);
+extern char* ax2asc(ax25_address *);
+extern int ax25cmp(ax25_address *, ax25_address *);
+extern ax25_cb *ax25_send_frame(struct sk_buff*, int, ax25_addr_t*, struct net_device*);
+extern ax25_cb *ax25_find_cb(ax25_addr_t*, struct net_device*);
/* ax25_out.c */
-extern ax25_cb *ax25_send_frame(struct sk_buff *, int, ax25_address *, ax25_address *, ax25_digi *, struct net_device *);
extern void ax25_output(ax25_cb *, int, struct sk_buff *);
-extern void ax25_kick(ax25_cb *);
-extern void ax25_transmit_buffer(ax25_cb *, struct sk_buff *, int);
-extern void ax25_queue_xmit(struct sk_buff *);
-extern int ax25_check_iframes_acked(ax25_cb *, unsigned short);
-
-/* ax25_route.c */
-extern void ax25_rt_device_down(struct net_device *);
-extern int ax25_rt_ioctl(unsigned int, void *);
-extern int ax25_rt_get_info(char *, char **, off_t, int);
-extern int ax25_rt_autobind(ax25_cb *, ax25_address *);
-extern ax25_route *ax25_rt_find_route(ax25_address *, struct net_device *);
-extern struct sk_buff *ax25_rt_build_path(struct sk_buff *, ax25_address *, ax25_address *, ax25_digi *);
-extern void ax25_rt_free(void);
-
-/* ax25_std_in.c */
-extern int ax25_std_frame_in(ax25_cb *, struct sk_buff *, int);
-
-/* ax25_std_subr.c */
-extern void ax25_std_nr_error_recovery(ax25_cb *);
-extern void ax25_std_establish_data_link(ax25_cb *);
-extern void ax25_std_transmit_enquiry(ax25_cb *);
-extern void ax25_std_enquiry_response(ax25_cb *);
-extern void ax25_std_timeout_response(ax25_cb *);
-
-/* ax25_std_timer.c */
-extern void ax25_std_heartbeat_expiry(ax25_cb *);
-extern void ax25_std_t1timer_expiry(ax25_cb *);
-extern void ax25_std_t2timer_expiry(ax25_cb *);
-extern void ax25_std_t3timer_expiry(ax25_cb *);
-extern void ax25_std_idletimer_expiry(ax25_cb *);
-
-/* ax25_subr.c */
-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(ax25_cb *, struct sk_buff *, int *, int *, int *);
-extern void ax25_send_control(ax25_cb *, int, int, int);
-extern void ax25_return_dm(struct net_device *, ax25_address *, ax25_address *, ax25_digi *);
-extern void ax25_calculate_t1(ax25_cb *);
-extern void ax25_calculate_rtt(ax25_cb *);
-extern void ax25_disconnect(ax25_cb *, int);
/* ax25_timer.c */
-extern void ax25_start_heartbeat(ax25_cb *);
-extern void ax25_start_t1timer(ax25_cb *);
-extern void ax25_start_t2timer(ax25_cb *);
-extern void ax25_start_t3timer(ax25_cb *);
-extern void ax25_start_idletimer(ax25_cb *);
-extern void ax25_stop_heartbeat(ax25_cb *);
-extern void ax25_stop_t1timer(ax25_cb *);
-extern void ax25_stop_t2timer(ax25_cb *);
-extern void ax25_stop_t3timer(ax25_cb *);
-extern void ax25_stop_idletimer(ax25_cb *);
-extern int ax25_t1timer_running(ax25_cb *);
-extern unsigned long ax25_display_timer(struct timer_list *);
-
-/* ax25_uid.c */
-extern int ax25_uid_policy;
-extern ax25_address *ax25_findbyuid(uid_t);
-extern int ax25_uid_ioctl(int, struct sockaddr_ax25 *);
-extern int ax25_uid_get_info(char *, char **, off_t, int);
-extern void ax25_uid_free(void);
+extern void ax25_timer(ax25_cb *);
+extern void ax25_link_failed(ax25_cb *, int);
+extern int (*ax25_protocol_function(unsigned int))(struct sk_buff *, ax25_cb *);
/* sysctl_net_ax25.c */
-#ifdef CONFIG_SYSCTL
extern void ax25_register_sysctl(void);
extern void ax25_unregister_sysctl(void);
-#else
-extern inline void ax25_register_sysctl(void) {};
-extern inline void ax25_unregister_sysctl(void) {};
-#endif /* CONFIG_SYSCTL */
+
+/* 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_cb *, int));
+extern void ax25_linkfail_release(void (*)(ax25_cb *, int));
+extern int ax25_listen_register(ax25_address *, struct net_device *);
+extern void ax25_listen_release(ax25_address *, struct net_device *);
+extern int ax25_protocol_is_registered(unsigned int);
#endif
diff --git a/include/net/ax25_uid.h b/include/net/ax25_uid.h
new file mode 100644
index 000000000..ae40ff0fd
--- /dev/null
+++ b/include/net/ax25_uid.h
@@ -0,0 +1,33 @@
+/*
+ * This code REQUIRES 1.2.1 or higher/ NET3.029
+ *
+ * This module:
+ * This module is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#ifndef _AX25_UID_H
+#define _AX25_UID_H
+
+typedef struct ax25_uid_assoc {
+ struct ax25_uid_assoc *next;
+ uid_t uid;
+ ax25_address call;
+ char device[IFNAMSIZ];
+} ax25_uid_assoc;
+
+typedef enum {
+ AX25_UID_POLICY_ARBITRARY_CALLSIGN,
+ AX25_UID_POLICY_GIVEN_CALLSIGN,
+ AX25_UID_POLICY_ANY_SSID
+} t_ax25_uid_policy;
+
+extern t_ax25_uid_policy ax25_uid_policy;
+extern int ax25_cs_get_info(char *, char **, off_t, int);
+extern int ax25_uid_ioctl(int, struct sockaddr_ax25*);
+extern ax25_address* ax25_find_by_uid(uid_t uid);
+extern ax25_address* ax25_find_match_for_uid(uid_t uid, ax25_address *providec, char *device);
+
+#endif
diff --git a/include/net/ax25call.h b/include/net/ax25call.h
new file mode 100644
index 000000000..68b8a70c0
--- /dev/null
+++ b/include/net/ax25call.h
@@ -0,0 +1,2 @@
+/* Separate to keep compilation of protocols.c simpler */
+extern void ax25_proto_init(struct net_proto *pro);
diff --git a/include/net/ax25dev.h b/include/net/ax25dev.h
new file mode 100644
index 000000000..f2e125e6b
--- /dev/null
+++ b/include/net/ax25dev.h
@@ -0,0 +1,164 @@
+/*
+ * include/net/ax25dev.h
+ *
+ * intra-kernel interface declaration, anything needed by device drivers for
+ * AX.25 interfaces is defined here.
+ *
+ */
+
+#ifndef _NET_AX25DEV_H
+#define _NET_AX25DEV_H
+
+#include <linux/netdevice.h>
+#include <linux/sysctl.h>
+#include <linux/tqueue.h>
+#include <linux/timer.h>
+
+#ifndef AX25_TICS
+#define AX25_TICS (HZ/10)
+#endif
+
+#define AX25_MAX_DEVICES 20 /* Max No of AX.25 devices */
+#define AX25_DEV_MAGIC 0x88babe73
+
+enum {
+ AX25_VALUES_IPDEFMODE, /* 0=DG 1=VC */
+ AX25_VALUES_AXDEFMODE, /* 0=Normal 1=Extended Seq Nos */
+ AX25_VALUES_BACKOFF, /* 0=None 1=Linear 2=Exponential */
+ AX25_VALUES_CONMODE, /* Allow connected modes - 0=No 1=no "PID text" 2=all PIDs */
+ AX25_VALUES_WINDOW, /* Default window size for standard AX.25 */
+ AX25_VALUES_EWINDOW, /* Default window size for extended AX.25 */
+ AX25_VALUES_T1, /* Default T1 timeout value */
+ AX25_VALUES_T2, /* Default T2 timeout value */
+ AX25_VALUES_T3, /* Default T3 timeout value */
+ AX25_VALUES_IDLE, /* Connected mode idle timer */
+ AX25_VALUES_N2, /* Default N2 value */
+ AX25_VALUES_PACLEN, /* AX.25 MTU */
+ AX25_VALUES_PROTOCOL, /* What is this? */
+ AX25_VALUES_DAMA_SLAVE_TIMEOUT, /* DAMA */
+ AX25_VALUES_MEDIA_DUPLEX, /* Duplex type */
+ AX25_VALUES_MEDIA_TXDELAY, /* TX-Delay */
+ AX25_VALUES_MEDIA_TXTAIL, /* TX-Tail */
+ AX25_VALUES_MEDIA_TXBITRATE, /* TX-Bitrate */
+ AX25_VALUES_MEDIA_RXBITRATE, /* RX-Bitrate */
+ AX25_VALUES_MEDIA_SLOTTIME, /* Slottime */
+ AX25_VALUES_MEDIA_PPERSISTENCE, /* P-Persistence */
+ AX25_VALUES_MEDIA_AUTO_ADJUST, /* Enable/disable auto adjustment */
+ AX25_VALUES_DUMMY_0, /* For future use */
+ AX25_VALUES_DUMMY_1, /* For future use */
+ AX25_VALUES_DUMMY_2, /* For future use */
+ AX25_VALUES_DUMMY_3, /* For future use */
+ AX25_VALUES_DUMMY_4, /* For future use */
+ AX25_VALUES_DUMMY_5, /* For future use */
+ AX25_VALUES_DUMMY_6, /* For future use */
+ AX25_VALUES_DUMMY_7, /* For future use */
+ AX25_MAX_VALUES /* THIS MUST REMAIN THE LAST ENTRY OF THIS LIST */
+};
+
+#define AX25_DEF_IPDEFMODE 1 /* VC */
+#define AX25_DEF_AXDEFMODE 0 /* Normal */
+#define AX25_DEF_BACKOFF 1 /* Linear backoff */
+#define AX25_DEF_CONMODE 2 /* Connected mode allowed */
+#define AX25_DEF_WINDOW 7 /* Window=7 */
+#define AX25_DEF_EWINDOW 32 /* Module-128 Window=32 */
+#define AX25_DEF_T1 (10 * AX25_SLOWHZ) /* T1=10s */
+#define AX25_DEF_T2 (3 * AX25_SLOWHZ) /* T2=3s */
+#define AX25_DEF_T3 (90 * AX25_SLOWHZ) /* T3=90s */
+#define AX25_DEF_N2 10 /* N2=10 */
+#define AX25_DEF_IDLE (120 * AX25_SLOWHZ) /* Idle=120s */
+#define AX25_DEF_PACLEN 256 /* Paclen=256 */
+#define AX25_DEF_PROTOCOL 1 /* 0=CSMA; 1=CSMA/DAMA slave auto; 2=DAMA master */
+#define AX25_DEF_DAMA_SLAVE_TIMEOUT 0 /* ? */
+#define AX25_DEF_MEDIA_DUPLEX 0 /* Half duplex */
+#define AX25_DEF_MEDIA_TXDELAY 60 /* 60 ms */
+#define AX25_DEF_MEDIA_TXTAIL 10 /* 10 ms */
+#define AX25_DEF_MEDIA_TXBITRATE 9600 /* 9600 bps */
+#define AX25_DEF_MEDIA_RXBITRATE 9600 /* 9600 bps */
+#define AX25_DEF_MEDIA_SLOTTIME 10 /* 10 ms */
+#define AX25_DEF_MEDIA_PPERSISTENCE 32 /* 32/256 */
+#define AX25_DEF_MEDIA_AUTO_ADJUST 1 /* Auto adjust on */
+
+struct ax25_dev {
+ unsigned long magic;
+ struct net_device *netdev; /* backlink to the network device */
+ struct net_device *forward;
+ struct timer_list timer;
+ struct timer_list tics;
+ struct tq_struct task_queue;
+ struct sk_buff_head unproto_queue;
+ int needs_transmit;
+ unsigned int dama_mode;
+ struct {
+ struct ax25_cb *ready;
+ struct ax25_cb *all;
+ } list;
+
+ struct {
+ unsigned char fast; /*
+ * set for "infinitely"
+ * fast channels to skip
+ * arbitration
+ */
+
+ /* downcalls */
+ unsigned int (*dcd)(struct net_device *dev); /* required: report dcd state */
+ unsigned int (*ptt)(struct net_device *dev); /* required: report ptt state */
+ unsigned int (*cts)(struct net_device *dev); /* optional: report "clear to send" */
+ void (*rts)(struct net_device *dev); /* optional: forced "key transmitter" */
+ void (*parameter_change_notify)( /* configure media parameter */
+ struct net_device *dev,
+ int id, /* parameter type */
+ int old, /* old value */
+ int new); /* new value */
+ } hw;
+
+ struct ctl_table systable[AX25_MAX_VALUES+1];
+ int values[AX25_MAX_VALUES];
+
+ /* handled by DDI layer */
+ unsigned int bit_per_jiffie; /* internal use */
+ unsigned int jiffies_per_slot; /* internal use */
+ unsigned char dcd_memory; /* internal use */
+ unsigned char dcd_dropped; /* internal use */
+ unsigned char dama_polled; /* internal use */
+ unsigned int bytes_sent;
+ unsigned int max_bytes;
+
+ /* statistics */
+ unsigned long tx_iframes;
+ unsigned long rx_iframes;
+ unsigned long tx_bytes;
+ unsigned long rx_bytes;
+ unsigned long rx_rejects;
+
+ rwlock_t ready_lock;
+};
+
+#define DAMA_SLAVE (1<<0)
+#define DAMA_MASTER (1<<1)
+
+#define AX25_PTR(dev) ((struct ax25_dev *)dev->ax25_ptr)
+
+extern void register_ax25device(struct net_device *dev);
+extern void unregister_ax25device(struct net_device *dev);
+
+
+/*
+ * Call this function from device driver code for reading a parameter
+ */
+extern inline int ax25_dev_get_value(struct net_device *dev, int valueno)
+{
+ struct ax25_dev *ax25_device = AX25_PTR(dev);
+ return ax25_device->values[valueno];
+}
+
+/*
+ * Call this function from device driver code for writing a parameter
+ */
+extern inline void ax25_dev_set_value(struct net_device *dev, int valueno, int newvalue)
+{
+ struct ax25_dev *ax25_device = AX25_PTR(dev);
+ ax25_device->values[valueno] = newvalue;
+}
+
+#endif /* _NET_AX25DEV_H */
diff --git a/include/net/netrom.h b/include/net/netrom.h
index 21c9f8b86..b6ccf33a9 100644
--- a/include/net/netrom.h
+++ b/include/net/netrom.h
@@ -76,8 +76,7 @@ typedef struct {
struct nr_neigh {
struct nr_neigh *next;
- ax25_address callsign;
- ax25_digi *digipeat;
+ ax25_addr_t addr;
ax25_cb *ax25;
struct net_device *dev;
unsigned char quality;
diff --git a/include/net/rose.h b/include/net/rose.h
index f1f893e27..167e629b9 100644
--- a/include/net/rose.h
+++ b/include/net/rose.h
@@ -81,8 +81,7 @@ enum {
struct rose_neigh {
struct rose_neigh *next;
- ax25_address callsign;
- ax25_digi *digipeat;
+ ax25_addr_t addr;
ax25_cb *ax25;
struct net_device *dev;
unsigned short count;