Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6-omap-h63xx.git] / include / net / dn_nsp.h

diff --git a/include/net/dn_nsp.h b/include/net/dn_nsp.h
index 8a0891e2e888bb83e267186961ab9c684b11ac78..e6182b86262b837d637ea3d3eebc2fccf44a2a99 100644 (file)
--- a/include/net/dn_nsp.h
+++ b/include/net/dn_nsp.h
@@ -19,9 +19,9 @@ 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, unsigned int __nocast gfp);
+extern void dn_send_conn_conf(struct sock *sk, gfp_t gfp);
 extern void dn_nsp_send_disc(struct sock *sk, unsigned char type, 
-                       unsigned short reason, unsigned int __nocast gfp);
+                       unsigned short reason, gfp_t gfp);
 extern void dn_nsp_return_disc(struct sk_buff *skb, unsigned char type,
                                unsigned short reason);
 extern void dn_nsp_send_link(struct sock *sk, unsigned char lsflags, char fcval);
@@ -29,14 +29,14 @@ extern void dn_nsp_send_conninit(struct sock *sk, unsigned char flags);
 
 extern void dn_nsp_output(struct sock *sk);
 extern int dn_nsp_check_xmit_queue(struct sock *sk, struct sk_buff *skb, struct sk_buff_head *q, unsigned short acknum);
-extern void dn_nsp_queue_xmit(struct sock *sk, struct sk_buff *skb, unsigned int __nocast gfp, int oob);
+extern void dn_nsp_queue_xmit(struct sock *sk, struct sk_buff *skb, gfp_t gfp, int oob);
 extern unsigned long dn_nsp_persist(struct sock *sk);
 extern int dn_nsp_xmit_timeout(struct sock *sk);
 
 extern int dn_nsp_rx(struct sk_buff *);
 extern int dn_nsp_backlog_rcv(struct sock *sk, struct sk_buff *skb);
 
-extern struct sk_buff *dn_alloc_skb(struct sock *sk, int size, unsigned int __nocast pri);
+extern struct sk_buff *dn_alloc_skb(struct sock *sk, int size, gfp_t pri);
 extern struct sk_buff *dn_alloc_send_skb(struct sock *sk, size_t *size, int noblock, long timeo, int *err);
 
 #define NSP_REASON_OK 0                /* No error */
@@ -72,78 +72,78 @@ extern struct sk_buff *dn_alloc_send_skb(struct sock *sk, size_t *size, int nobl
 
 struct nsp_data_seg_msg
 {
-       unsigned char   msgflg          __attribute__((packed));
-       unsigned short  dstaddr         __attribute__((packed));
-       unsigned short  srcaddr         __attribute__((packed));
-};
+       unsigned char   msgflg;
+       unsigned short  dstaddr;
+       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));
-};
+       unsigned short  acknum;
+       unsigned short  segnum;
+       unsigned short  lsflgs;
+} __attribute__((packed));
 
 struct nsp_data_opt_msg1
 {
-       unsigned short  acknum          __attribute__((packed));
-       unsigned short  segnum          __attribute__((packed));
-};
+       unsigned short  acknum;
+       unsigned short  segnum;
+} __attribute__((packed));
 
 
 /* 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));
-};
+       unsigned char   msgflg;
+       unsigned short  dstaddr;
+       unsigned short  srcaddr;
+       unsigned short  acknum;
+} __attribute__((packed));
 
 /* Connect Acknowledgment Message */
 struct  nsp_conn_ack_msg
 {
-       unsigned char   msgflg          __attribute__((packed));
-       unsigned short  dstaddr         __attribute__((packed));
-};
+       unsigned char   msgflg;
+       unsigned short  dstaddr;
+} __attribute__((packed));
 
 
 /* Connect Initiate/Retransmit Initiate/Connect Confirm */
 struct  nsp_conn_init_msg
 {
-       unsigned char   msgflg          __attribute__((packed));
+       unsigned char   msgflg;
 #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));
+       unsigned short  dstaddr;
+       unsigned short  srcaddr;
+       unsigned char   services;
 #define NSP_FC_NONE   0x00            /* Flow Control None    */
 #define NSP_FC_SRC    0x04            /* Seg Req. Count       */
 #define NSP_FC_SCMC   0x08            /* Sess. Control Mess   */
 #define NSP_FC_MASK   0x0c            /* FC type mask         */
-       unsigned char   info            __attribute__((packed));
-        unsigned short  segsize         __attribute__((packed));
-};
+       unsigned char   info;
+       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));
-};
+       unsigned char   msgflg;
+       unsigned short  dstaddr;
+       unsigned short  srcaddr;
+       unsigned short  reason;
+} __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));
-};
+       char            format;
+       unsigned char   task;
+       unsigned short  grpcode;
+       unsigned short  usrcode;
+       char            dlen;
+} __attribute__((packed));
 
 /*
  * A collection of functions for manipulating the sequence