Merge /spare/repo/linux-2.6/

5 files changed, 61 insertions, 16 deletions

diff --git a/include/net/ax25.h b/include/net/ax25.h
index 364b046e9f47..9dbcd9e51c00 100644
--- a/include/net/ax25.h
+++ b/include/net/ax25.h
@@ -26,11 +26,20 @@
 
 /* AX.25 Protocol IDs */
 #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 AX25_P_VJCOMP                   0x06    /* Compressed TCP/IP packet   */
+                                                /* Van Jacobsen (RFC 1144)    */
+#define AX25_P_VJUNCOMP                 0x07    /* Uncompressed TCP/IP packet */
+                                                /* Van Jacobsen (RFC 1144)    */
+#define AX25_P_SEGMENT                  0x08    /* Segmentation fragment      */
+#define AX25_P_TEXNET                   0xc3    /* TEXTNET datagram protocol  */
+#define AX25_P_LQ                       0xc4    /* Link Quality Protocol      */
+#define AX25_P_ATALK                    0xca    /* Appletalk                  */
+#define AX25_P_ATALK_ARP                0xcb    /* Appletalk ARP              */
+#define AX25_P_IP                       0xcc    /* ARPA Internet Protocol     */
+#define AX25_P_ARP                      0xcd    /* ARPA Adress Resolution     */
+#define AX25_P_FLEXNET                  0xce    /* FlexNet                    */
+#define AX25_P_NETROM                   0xcf    /* NET/ROM                    */
+#define AX25_P_TEXT                     0xF0    /* No layer 3 protocol impl.  */
 
 /* AX.25 Segment control values */
 #define AX25_SEG_REM                    0x7F
@@ -88,11 +97,11 @@
 /* Define Link State constants. */
 
 enum { 
-        AX25_STATE_0,
-        AX25_STATE_1,
-        AX25_STATE_2,
-        AX25_STATE_3,
-        AX25_STATE_4
+        AX25_STATE_0,                   /* Listening */
+        AX25_STATE_1,                   /* SABM sent */
+        AX25_STATE_2,                   /* DISC sent */
+        AX25_STATE_3,                   /* Established */
+        AX25_STATE_4                    /* Recovery */
 };
 
 #define AX25_MODULUS            8       /*  Standard AX.25 modulus */
@@ -258,7 +267,7 @@ extern struct sock *ax25_make_new(struct sock *, struct ax25_dev *);
 /* ax25_addr.c */
 extern ax25_address null_ax25_address;
 extern char *ax2asc(char *buf, ax25_address *);
-extern ax25_address *asc2ax(char *);
+extern void asc2ax(ax25_address *addr, char *callsign);
 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 *);
@@ -319,7 +328,7 @@ extern int  ax25_rx_iframe(ax25_cb *, struct sk_buff *);
 extern int  ax25_kiss_rcv(struct sk_buff *, struct net_device *, struct packet_type *, struct net_device *);
 
 /* ax25_ip.c */
-extern int  ax25_encapsulate(struct sk_buff *, struct net_device *, unsigned short, void *, void *, unsigned int);
+extern int  ax25_hard_header(struct sk_buff *, struct net_device *, unsigned short, void *, void *, unsigned int);
 extern int  ax25_rebuild_header(struct sk_buff *);
 
 /* ax25_out.c */
diff --git a/include/net/compat.h b/include/net/compat.h
index 9983fd857804..290bab46d457 100644
--- a/include/net/compat.h
+++ b/include/net/compat.h
@@ -33,7 +33,8 @@ extern asmlinkage long compat_sys_sendmsg(int,struct compat_msghdr __user *,unsi
 extern asmlinkage long compat_sys_recvmsg(int,struct compat_msghdr __user *,unsigned);
 extern asmlinkage long compat_sys_getsockopt(int, int, int, char __user *, int __user *);
 extern int put_cmsg_compat(struct msghdr*, int, int, int, void *);
-extern int cmsghdr_from_user_compat_to_kern(struct msghdr *, unsigned char *,
-                int);
+
+struct sock;
+extern int cmsghdr_from_user_compat_to_kern(struct msghdr *, struct sock *, unsigned char *, int);
 
 #endif /* NET_COMPAT_H */
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 3203eaff4bd4..65ec86678a08 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -233,6 +233,10 @@ extern int 			ip6_ra_control(struct sock *sk, int sel,
 extern int                      ipv6_parse_hopopts(struct sk_buff *skb, int);
 
 extern struct ipv6_txoptions *  ipv6_dup_options(struct sock *sk, struct ipv6_txoptions *opt);
+extern struct ipv6_txoptions *  ipv6_renew_options(struct sock *sk, struct ipv6_txoptions *opt,
+                                                   int newtype,
+                                                   struct ipv6_opt_hdr __user *newopt,
+                                                   int newoptlen);
 
 extern int ip6_frag_nqueues;
 extern atomic_t ip6_frag_mem;
@@ -373,6 +377,7 @@ extern int			ip6_append_data(struct sock *sk,
                                                 int length,
                                                 int transhdrlen,
                                                 int hlimit,
+                                                int tclass,
                                                 struct ipv6_txoptions *opt,
                                                 struct flowi *fl,
                                                 struct rt6_info *rt,
diff --git a/include/net/netrom.h b/include/net/netrom.h
index 45f2c7616d8b..a6bf6e0f606a 100644
--- a/include/net/netrom.h
+++ b/include/net/netrom.h
@@ -6,6 +6,7 @@
 
 #ifndef _NETROM_H
 #define _NETROM_H 
+
 #include <linux/netrom.h>
 #include <linux/list.h>
 #include <net/sock.h>
@@ -22,6 +23,7 @@
 #define NR_DISCACK                      0x04
 #define NR_INFO                         0x05
 #define NR_INFOACK                      0x06
+#define NR_RESET                        0x07
 
 #define NR_CHOKE_FLAG                   0x80
 #define NR_NAK_FLAG                     0x40
@@ -51,11 +53,16 @@ enum {
 #define NR_DEFAULT_TTL                  16              /* Default Time To Live - 16 */
 #define NR_DEFAULT_ROUTING              1               /* Is routing enabled ? */
 #define NR_DEFAULT_FAILS                2               /* Link fails until route fails */
+#define NR_DEFAULT_RESET                0               /* Sent / accept reset cmds? */
 
 #define NR_MODULUS                      256
 #define NR_MAX_WINDOW_SIZE              127                     /* Maximum Window Allowable - 127 */
 #define NR_MAX_PACKET_SIZE              236                     /* Maximum Packet Length - 236 */
 
+struct nr_private {
+        struct net_device_stats stats;
+};
+
 struct nr_sock {
         struct sock             sock;
         ax25_address            user_addr, source_addr, dest_addr;
@@ -176,6 +183,8 @@ extern int  sysctl_netrom_transport_requested_window_size;
 extern int  sysctl_netrom_transport_no_activity_timeout;
 extern int  sysctl_netrom_routing_control;
 extern int  sysctl_netrom_link_fails_count;
+extern int  sysctl_netrom_reset_circuit;
+
 extern int  nr_rx_frame(struct sk_buff *, struct net_device *);
 extern void nr_destroy_socket(struct sock *);
 
@@ -218,7 +227,28 @@ extern void nr_requeue_frames(struct sock *);
 extern int  nr_validate_nr(struct sock *, unsigned short);
 extern int  nr_in_rx_window(struct sock *, unsigned short);
 extern void nr_write_internal(struct sock *, int);
-extern void nr_transmit_refusal(struct sk_buff *, int);
+
+extern void __nr_transmit_reply(struct sk_buff *skb, int mine,
+        unsigned char cmdflags);
+
+/*
+ * This routine is called when a Connect Acknowledge with the Choke Flag
+ * set is needed to refuse a connection.
+ */
+#define nr_transmit_refusal(skb, mine)                                  \
+do {                                                                    \
+        __nr_transmit_reply((skb), (mine), NR_CONNACK | NR_CHOKE_FLAG); \
+} while (0)
+
+/*
+ * This routine is called when we don't have a circuit matching an incoming
+ * NET/ROM packet.  This is an G8PZT Xrouter extension.
+ */
+#define nr_transmit_reset(skb, mine)                                    \
+do {                                                                    \
+        __nr_transmit_reply((skb), (mine), NR_RESET);                   \
+} while (0)
+
 extern void nr_disconnect(struct sock *, int);
 
 /* nr_timer.c */
diff --git a/include/net/transp_v6.h b/include/net/transp_v6.h
index 8b075ab7a26c..4e86f2de6638 100644
--- a/include/net/transp_v6.h
+++ b/include/net/transp_v6.h
@@ -37,7 +37,7 @@ extern int			datagram_recv_ctl(struct sock *sk,
 extern int                      datagram_send_ctl(struct msghdr *msg,
                                                   struct flowi *fl,
                                                   struct ipv6_txoptions *opt,
-                                                  int *hlimit);
+                                                  int *hlimit, int *tclass);
 
 #define         LOOPBACK4_IPV6          __constant_htonl(0x7f000006)