Merge with Linux 2.3.40.

1 files changed, 70 insertions, 76 deletions

diff --git a/include/net/dn_nsp.h b/include/net/dn_nsp.h
index d8cef8c06..498ea16fd 100644
--- a/include/net/dn_nsp.h
+++ b/include/net/dn_nsp.h
@@ -19,8 +19,11 @@ extern void dn_nsp_send_data_ack(struct sock *sk);
 extern void dn_nsp_send_oth_ack(struct sock *sk);
 extern void dn_nsp_delayed_ack(struct sock *sk);
 extern void dn_send_conn_ack(struct sock *sk);
-extern void dn_send_conn_conf(struct sock *sk);
-extern void dn_send_disc(struct sock *sk, unsigned char type, unsigned short reason);
+extern void dn_send_conn_conf(struct sock *sk, int gfp);
+extern void dn_nsp_send_disc(struct sock *sk, unsigned char type, 
+				unsigned short reason, int gfp);
+extern void dn_nsp_return_disc(struct sk_buff *skb, unsigned char type,
+				unsigned short reason);
 extern void dn_nsp_send_lnk(struct sock *sk, unsigned short flags);
 extern void dn_nsp_send_conninit(struct sock *sk, unsigned char flags);
 
@@ -49,88 +52,79 @@ extern struct sk_buff *dn_alloc_send_skb(struct sock *sk, int *size, int noblock
 
 /* Data Messages    (data segment/interrupt/link service)               */
 
-        struct nsp_data_seg_msg
-        {
-                unsigned char   msgflg          __attribute__((packed));
-                unsigned short  dstaddr         __attribute__((packed));
-                unsigned short  srcaddr         __attribute__((packed));
-        };
-
-        struct nsp_data_opt_msg
-        {
-                unsigned short  acknum          __attribute__((packed));
-                unsigned short  segnum          __attribute__((packed));
-                unsigned short  lsflgs          __attribute__((packed));
-        };
-
-        struct nsp_data_opt_msg1
-        {
-                unsigned short  acknum          __attribute__((packed));
-                unsigned short  segnum          __attribute__((packed));
-        };
-
-/* Acknowledgment Messages */
-/*-------------------------*/
-
-/* Acknowledgment Messages (data/other data)                             */
-
-        struct  nsp_data_ack_msg
-        {
-                unsigned char   msgflg          __attribute__((packed));
-                unsigned short  dstaddr         __attribute__((packed));
-                unsigned short  srcaddr         __attribute__((packed));
-                unsigned short  acknum          __attribute__((packed));
-        };
+struct nsp_data_seg_msg
+{
+	unsigned char   msgflg          __attribute__((packed));
+	unsigned short  dstaddr         __attribute__((packed));
+	unsigned short  srcaddr         __attribute__((packed));
+};
 
-/* Connect Acknowledgment Message */
+struct nsp_data_opt_msg
+{
+	unsigned short  acknum          __attribute__((packed));
+	unsigned short  segnum          __attribute__((packed));
+	unsigned short  lsflgs          __attribute__((packed));
+};
+
+struct nsp_data_opt_msg1
+{
+	unsigned short  acknum          __attribute__((packed));
+	unsigned short  segnum          __attribute__((packed));
+};
 
-        struct  nsp_conn_ack_msg
-        {
-                unsigned char   msgflg          __attribute__((packed));
-                unsigned short  dstaddr         __attribute__((packed));
-        };
 
-/* Control Messages */
-/*------------------*/
+/* Acknowledgment Message (data/other data)                             */
+struct nsp_data_ack_msg
+{
+	unsigned char   msgflg          __attribute__((packed));
+	unsigned short  dstaddr         __attribute__((packed));
+	unsigned short  srcaddr         __attribute__((packed));
+	unsigned short  acknum          __attribute__((packed));
+};
+
+/* Connect Acknowledgment Message */
+struct  nsp_conn_ack_msg
+{
+	unsigned char   msgflg          __attribute__((packed));
+	unsigned short  dstaddr         __attribute__((packed));
+};
 
-/* Connect Initiate/Retransmit Initiate/Connect Confirm */
 
-        struct  nsp_conn_init_msg
-        {
-                unsigned char   msgflg          __attribute__((packed));
-#define         NSP_CI          0x18            /* Connect Initiate     */
-#define         NSP_RCI         0x68            /* Retrans. Conn Init   */
-                unsigned short  dstaddr         __attribute__((packed));
-                unsigned short  srcaddr         __attribute__((packed));
-                unsigned char   services        __attribute__((packed));
-#define         NSP_FC_NONE     0x00            /* Flow Control None    */
-#define         NSP_FC_SRC      0x04            /* Seg Req. Count       */
-#define         NSP_FC_SCMC     0x08            /* Sess. Control Mess   */
-                unsigned char   info            __attribute__((packed));
-                unsigned short  segsize         __attribute__((packed));
-        };
+/* Connect Initiate/Retransmit Initiate/Connect Confirm */
+struct  nsp_conn_init_msg
+{
+	unsigned char   msgflg          __attribute__((packed));
+#define NSP_CI      0x18            /* Connect Initiate     */
+#define NSP_RCI     0x68            /* Retrans. Conn Init   */
+	unsigned short  dstaddr         __attribute__((packed));
+        unsigned short  srcaddr         __attribute__((packed));
+        unsigned char   services        __attribute__((packed));
+#define NSP_FC_NONE   0x00            /* Flow Control None    */
+#define NSP_FC_SRC    0x04            /* Seg Req. Count       */
+#define NSP_FC_SCMC   0x08            /* Sess. Control Mess   */
+	unsigned char   info            __attribute__((packed));
+        unsigned short  segsize         __attribute__((packed));
+};
 
 /* Disconnect Initiate/Disconnect Confirm */
+struct  nsp_disconn_init_msg
+{
+	unsigned char   msgflg          __attribute__((packed));
+        unsigned short  dstaddr         __attribute__((packed));
+        unsigned short  srcaddr         __attribute__((packed));
+        unsigned short  reason          __attribute__((packed));
+};
+
 
-        struct  nsp_disconn_init_msg
-        {
-                unsigned char   msgflg          __attribute__((packed));
-                unsigned short  dstaddr         __attribute__((packed));
-                unsigned short  srcaddr         __attribute__((packed));
-                unsigned short  reason          __attribute__((packed));
-        };
-
-
-/*------------------------- SCP - messages ------------------------------*/
-
-        struct  srcobj_fmt
-        {
-                char            format          __attribute__((packed));
-                unsigned char   task            __attribute__((packed));
-                unsigned short  grpcode         __attribute__((packed));
-                unsigned short  usrcode         __attribute__((packed));
-                char            dlen            __attribute__((packed));
-        };
+
+struct  srcobj_fmt
+{
+	char            format          __attribute__((packed));
+        unsigned char   task            __attribute__((packed));
+        unsigned short  grpcode         __attribute__((packed));
+        unsigned short  usrcode         __attribute__((packed));
+        char            dlen            __attribute__((packed));
+};
 
 /*
  * A collection of functions for manipulating the sequence