[DECnet]: Endian annotation and fixes for DECnet.

The typedef for dn_address has been removed in favour of using __le16
or __u16 directly as appropriate. All the DECnet header files are
updated accordingly.

The byte ordering of dn_eth2dn() and dn_dn2eth() are both changed
since just about all their callers wanted network order rather than
host order, so the conversion is now done in the functions themselves.

Several missed endianess conversions have been picked up during the
conversion process. The nh_gw field in struct dn_fib_info has been
changed from a 32 bit field to 16 bits as it ought to be.

One or two cases of using htons rather than dn_htons in the routing
code have been found and fixed.

There are still a few warnings to fix, but this patch deals with the
important cases.

Signed-off-by: Steven Whitehouse <steve@chygwyn.com>
Signed-off-by: Patrick Caulfield <patrick@tykepenguin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

7 files changed, 155 insertions, 156 deletions

diff --git a/include/net/dn.h b/include/net/dn.h
index a4b6168e1e25..465b78302782 100644
--- a/include/net/dn.h
+++ b/include/net/dn.h
@@ -6,10 +6,8 @@
 #include <net/tcp.h>
 #include <asm/byteorder.h>
 
-typedef unsigned short dn_address;
-
-#define dn_ntohs(x) le16_to_cpu((unsigned short)(x))
-#define dn_htons(x) cpu_to_le16((unsigned short)(x))
+#define dn_ntohs(x) le16_to_cpu(x)
+#define dn_htons(x) cpu_to_le16(x)
 
 struct dn_scp                                   /* Session Control Port */
 {
@@ -31,36 +29,36 @@ struct dn_scp                                   /* Session Control Port */
 #define DN_CL    15                     /* Closed               */
 #define DN_CN    16                     /* Closed Notification  */
 
-        unsigned short          addrloc;
-        unsigned short          addrrem;
-        unsigned short          numdat;
-        unsigned short          numoth;
-        unsigned short          numoth_rcv;
-        unsigned short          numdat_rcv;
-        unsigned short          ackxmt_dat;
-        unsigned short          ackxmt_oth;
-        unsigned short          ackrcv_dat;
-        unsigned short          ackrcv_oth;
-        unsigned char           flowrem_sw;
-        unsigned char           flowloc_sw;
+        __le16          addrloc;
+        __le16          addrrem;
+        __u16          numdat;
+        __u16          numoth;
+        __u16          numoth_rcv;
+        __u16          numdat_rcv;
+        __u16          ackxmt_dat;
+        __u16          ackxmt_oth;
+        __u16          ackrcv_dat;
+        __u16          ackrcv_oth;
+        __u8           flowrem_sw;
+        __u8           flowloc_sw;
 #define DN_SEND         2
 #define DN_DONTSEND     1
 #define DN_NOCHANGE     0
-        unsigned short          flowrem_dat;
-        unsigned short          flowrem_oth;
-        unsigned short          flowloc_dat;
-        unsigned short          flowloc_oth;
-        unsigned char           services_rem;
-        unsigned char           services_loc;
-        unsigned char           info_rem;
-        unsigned char           info_loc;
-
-        unsigned short          segsize_rem;
-        unsigned short          segsize_loc;
-
-        unsigned char           nonagle;
-        unsigned char           multi_ireq;
-        unsigned char           accept_mode;
+        __u16           flowrem_dat;
+        __u16           flowrem_oth;
+        __u16           flowloc_dat;
+        __u16           flowloc_oth;
+        __u8            services_rem;
+        __u8            services_loc;
+        __u8            info_rem;
+        __u8            info_loc;
+
+        __u16           segsize_rem;
+        __u16           segsize_loc;
+
+        __u8            nonagle;
+        __u8            multi_ireq;
+        __u8            accept_mode;
         unsigned long           seg_total; /* Running total of current segment */
 
         struct optdata_dn     conndata_in;
@@ -160,40 +158,41 @@ static inline struct dn_scp *DN_SK(struct sock *sk)
  */
 #define DN_SKB_CB(skb) ((struct dn_skb_cb *)(skb)->cb)
 struct dn_skb_cb {
-        unsigned short dst;
-        unsigned short src;
-        unsigned short hops;
-        unsigned short dst_port;
-        unsigned short src_port;
-        unsigned char services;
-        unsigned char info;
-        unsigned char rt_flags;
-        unsigned char nsp_flags;
-        unsigned short segsize;
-        unsigned short segnum;
-        unsigned short xmit_count;
+        __le16 dst;
+        __le16 src;
+        __u16 hops;
+        __le16 dst_port;
+        __le16 src_port;
+        __u8 services;
+        __u8 info;
+        __u8 rt_flags;
+        __u8 nsp_flags;
+        __u16 segsize;
+        __u16 segnum;
+        __u16 xmit_count;
         unsigned long stamp;
         int iif;
 };
 
-static inline dn_address dn_eth2dn(unsigned char *ethaddr)
+static inline __le16 dn_eth2dn(unsigned char *ethaddr)
 {
-        return ethaddr[4] | (ethaddr[5] << 8);
+        return dn_htons(ethaddr[4] | (ethaddr[5] << 8));
 }
 
-static inline dn_address dn_saddr2dn(struct sockaddr_dn *saddr)
+static inline __le16 dn_saddr2dn(struct sockaddr_dn *saddr)
 {
-        return *(dn_address *)saddr->sdn_nodeaddr;
+        return *(__le16 *)saddr->sdn_nodeaddr;
 }
 
-static inline void dn_dn2eth(unsigned char *ethaddr, dn_address addr)
+static inline void dn_dn2eth(unsigned char *ethaddr, __le16 addr)
 {
+        __u16 a = dn_ntohs(addr);
         ethaddr[0] = 0xAA;
         ethaddr[1] = 0x00;
         ethaddr[2] = 0x04;
         ethaddr[3] = 0x00;
-        ethaddr[4] = (unsigned char)(addr & 0xff);
-        ethaddr[5] = (unsigned char)(addr >> 8);
+        ethaddr[4] = (__u8)(a & 0xff);
+        ethaddr[5] = (__u8)(a >> 8);
 }
 
 static inline void dn_sk_ports_copy(struct flowi *fl, struct dn_scp *scp)
@@ -202,7 +201,7 @@ static inline void dn_sk_ports_copy(struct flowi *fl, struct dn_scp *scp)
         fl->uli_u.dnports.dport = scp->addrrem;
         fl->uli_u.dnports.objnum = scp->addr.sdn_objnum;
         if (fl->uli_u.dnports.objnum == 0) {
-                fl->uli_u.dnports.objnamel = scp->addr.sdn_objnamel;
+                fl->uli_u.dnports.objnamel = (__u8)dn_ntohs(scp->addr.sdn_objnamel);
                 memcpy(fl->uli_u.dnports.objname, scp->addr.sdn_objname, 16);
         }
 }
@@ -217,7 +216,7 @@ extern unsigned dn_mss_from_pmtu(struct net_device *dev, int mtu);
 extern struct sock *dn_sklist_find_listener(struct sockaddr_dn *addr);
 extern struct sock *dn_find_by_skb(struct sk_buff *skb);
 #define DN_ASCBUF_LEN 9
-extern char *dn_addr2asc(dn_address, char *);
+extern char *dn_addr2asc(__u16, char *);
 extern int dn_destroy_timer(struct sock *sk);
 
 extern int dn_sockaddr2username(struct sockaddr_dn *addr, unsigned char *buf, unsigned char type);
@@ -226,7 +225,7 @@ extern int dn_username2sockaddr(unsigned char *data, int len, struct sockaddr_dn
 extern void dn_start_slow_timer(struct sock *sk);
 extern void dn_stop_slow_timer(struct sock *sk);
 
-extern dn_address decnet_address;
+extern __le16 decnet_address;
 extern int decnet_debug_level;
 extern int decnet_time_wait;
 extern int decnet_dn_count;
diff --git a/include/net/dn_dev.h b/include/net/dn_dev.h
index 5a86e78081bf..cee46821dc53 100644
--- a/include/net/dn_dev.h
+++ b/include/net/dn_dev.h
@@ -7,11 +7,11 @@ struct dn_dev;
 struct dn_ifaddr {
         struct dn_ifaddr *ifa_next;
         struct dn_dev    *ifa_dev;
-        dn_address       ifa_local;
-        dn_address       ifa_address;
-        unsigned char    ifa_flags;
-        unsigned char    ifa_scope;
-        char             ifa_label[IFNAMSIZ];
+        __le16            ifa_local;
+        __le16            ifa_address;
+        __u8              ifa_flags;
+        __u8              ifa_scope;
+        char              ifa_label[IFNAMSIZ];
 };
 
 #define DN_DEV_S_RU  0 /* Run - working normally   */
@@ -91,7 +91,7 @@ struct dn_dev {
         struct timer_list timer;
         unsigned long t3;
         struct neigh_parms *neigh_parms;
-        unsigned char addr[ETH_ALEN];
+        __u8 addr[ETH_ALEN];
         struct neighbour *router; /* Default router on circuit */
         struct neighbour *peer;   /* Peer on pointopoint links */
         unsigned long uptime;     /* Time device went up in jiffies */
@@ -99,56 +99,56 @@ struct dn_dev {
 
 struct dn_short_packet
 {
-        unsigned char   msgflg;
-        unsigned short  dstnode;
-        unsigned short  srcnode;
-        unsigned char   forward;
+        __u8    msgflg;
+        __le16 dstnode;
+        __le16 srcnode;
+        __u8   forward;
 } __attribute__((packed));
 
 struct dn_long_packet
 {
-        unsigned char   msgflg;
-        unsigned char   d_area;
-        unsigned char   d_subarea;
-        unsigned char   d_id[6];
-        unsigned char   s_area;
-        unsigned char   s_subarea;
-        unsigned char   s_id[6];
-        unsigned char   nl2;
-        unsigned char   visit_ct;
-        unsigned char   s_class;
-        unsigned char   pt;
+        __u8   msgflg;
+        __u8   d_area;
+        __u8   d_subarea;
+        __u8   d_id[6];
+        __u8   s_area;
+        __u8   s_subarea;
+        __u8   s_id[6];
+        __u8   nl2;
+        __u8   visit_ct;
+        __u8   s_class;
+        __u8   pt;
 } __attribute__((packed));
 
 /*------------------------- DRP - Routing messages ---------------------*/
 
 struct endnode_hello_message
 {
-        unsigned char   msgflg;
-        unsigned char   tiver[3];
-        unsigned char   id[6];
-        unsigned char   iinfo;
-        unsigned short  blksize;
-        unsigned char   area;
-        unsigned char   seed[8];
-        unsigned char   neighbor[6];
-        unsigned short  timer;
-        unsigned char   mpd;
-        unsigned char   datalen;
-        unsigned char   data[2];
+        __u8   msgflg;
+        __u8   tiver[3];
+        __u8   id[6];
+        __u8   iinfo;
+        __le16 blksize;
+        __u8   area;
+        __u8   seed[8];
+        __u8   neighbor[6];
+        __le16 timer;
+        __u8   mpd;
+        __u8   datalen;
+        __u8   data[2];
 } __attribute__((packed));
 
 struct rtnode_hello_message
 {
-        unsigned char   msgflg;
-        unsigned char   tiver[3];
-        unsigned char   id[6];
-        unsigned char   iinfo;
-        unsigned short  blksize;
-        unsigned char   priority;
-        unsigned char   area;
-        unsigned short  timer;
-        unsigned char   mpd;
+        __u8   msgflg;
+        __u8   tiver[3];
+        __u8   id[6];
+        __u8   iinfo;
+        __le16  blksize;
+        __u8   priority;
+        __u8   area;
+        __le16  timer;
+        __u8   mpd;
 } __attribute__((packed));
 
 
@@ -169,12 +169,12 @@ extern void dn_dev_down(struct net_device *);
 
 extern int dn_dev_set_default(struct net_device *dev, int force);
 extern struct net_device *dn_dev_get_default(void);
-extern int dn_dev_bind_default(dn_address *addr);
+extern int dn_dev_bind_default(__le16 *addr);
 
 extern int register_dnaddr_notifier(struct notifier_block *nb);
 extern int unregister_dnaddr_notifier(struct notifier_block *nb);
 
-static inline int dn_dev_islocal(struct net_device *dev, dn_address addr)
+static inline int dn_dev_islocal(struct net_device *dev, __le16 addr)
 {
         struct dn_dev *dn_db = dev->dn_ptr;
         struct dn_ifaddr *ifa;
diff --git a/include/net/dn_fib.h b/include/net/dn_fib.h
index cd3c96d9601b..a15dcf0d5c1e 100644
--- a/include/net/dn_fib.h
+++ b/include/net/dn_fib.h
@@ -37,7 +37,7 @@ struct dn_fib_nh {
         int                     nh_weight;
         int                     nh_power;
         int                     nh_oif;
-        u32                     nh_gw;
+        __le16                  nh_gw;
 };
 
 struct dn_fib_info {
@@ -48,7 +48,7 @@ struct dn_fib_info {
         int                     fib_dead;
         unsigned                fib_flags;
         int                     fib_protocol;
-        dn_address              fib_prefsrc;
+        __le16                  fib_prefsrc;
         __u32                   fib_priority;
         __u32                   fib_metrics[RTAX_MAX];
 #define dn_fib_mtu  fib_metrics[RTAX_MTU-1]
@@ -71,15 +71,15 @@ struct dn_fib_info {
 #define DN_FIB_RES_OIF(res)     (DN_FIB_RES_NH(res).nh_oif)
 
 typedef struct {
-        u16     datum;
+        __le16  datum;
 } dn_fib_key_t;
 
 typedef struct {
-        u16     datum;
+        __le16  datum;
 } dn_fib_hash_t;
 
 typedef struct {
-        u16     datum;
+        __u16   datum;
 } dn_fib_idx_t;
 
 struct dn_fib_node {
@@ -126,11 +126,11 @@ extern int dn_fib_semantic_match(int type, struct dn_fib_info *fi,
                         const struct flowi *fl,
                         struct dn_fib_res *res);
 extern void dn_fib_release_info(struct dn_fib_info *fi);
-extern u16 dn_fib_get_attr16(struct rtattr *attr, int attrlen, int type);
+extern __le16 dn_fib_get_attr16(struct rtattr *attr, int attrlen, int type);
 extern void dn_fib_flush(void);
 extern void dn_fib_select_multipath(const struct flowi *fl,
                                         struct dn_fib_res *res);
-extern int dn_fib_sync_down(dn_address local, struct net_device *dev, 
+extern int dn_fib_sync_down(__le16 local, struct net_device *dev,
                                 int force);
 extern int dn_fib_sync_up(struct net_device *dev);
 
@@ -148,8 +148,8 @@ extern void dn_fib_table_cleanup(void);
 extern void dn_fib_rules_init(void);
 extern void dn_fib_rules_cleanup(void);
 extern void dn_fib_rule_put(struct dn_fib_rule *);
-extern __u16 dn_fib_rules_policy(__u16 saddr, struct dn_fib_res *res, unsigned *flags);
-extern unsigned dnet_addr_type(__u16 addr);
+extern __le16 dn_fib_rules_policy(__le16 saddr, struct dn_fib_res *res, unsigned *flags);
+extern unsigned dnet_addr_type(__le16 addr);
 extern int dn_fib_lookup(const struct flowi *fl, struct dn_fib_res *res);
 
 /*
@@ -194,10 +194,10 @@ extern struct dn_fib_table *dn_fib_tables[];
 
 #endif /* CONFIG_DECNET_ROUTER */
 
-static inline u16 dnet_make_mask(int n)
+static inline __le16 dnet_make_mask(int n)
 {
         if (n)
-                return htons(~((1<<(16-n))-1));
+                return dn_htons(~((1<<(16-n))-1));
         return 0;
 }
 
diff --git a/include/net/dn_neigh.h b/include/net/dn_neigh.h
index 4b1eb038d637..4cb4ae7fb81f 100644
--- a/include/net/dn_neigh.h
+++ b/include/net/dn_neigh.h
@@ -7,13 +7,13 @@
  */
 struct dn_neigh {
         struct neighbour n;
-        dn_address addr;
+        __le16 addr;
         unsigned long flags;
 #define DN_NDFLAG_R1    0x0001 /* Router L1      */
 #define DN_NDFLAG_R2    0x0002 /* Router L2      */
 #define DN_NDFLAG_P3    0x0004 /* Phase III Node */
         unsigned long blksize;
-        unsigned char priority;
+        __u8 priority;
 };
 
 extern void dn_neigh_init(void);
diff --git a/include/net/dn_nsp.h b/include/net/dn_nsp.h
index e6182b86262b..96e816b6974d 100644
--- a/include/net/dn_nsp.h
+++ b/include/net/dn_nsp.h
@@ -72,77 +72,77 @@ extern struct sk_buff *dn_alloc_send_skb(struct sock *sk, size_t *size, int nobl
 
 struct nsp_data_seg_msg
 {
-        unsigned char   msgflg;
-        unsigned short  dstaddr;
-        unsigned short  srcaddr;
+        __u8   msgflg;
+        __le16 dstaddr;
+        __le16 srcaddr;
 } __attribute__((packed));
 
 struct nsp_data_opt_msg
 {
-        unsigned short  acknum;
-        unsigned short  segnum;
-        unsigned short  lsflgs;
+        __le16 acknum;
+        __le16 segnum;
+        __le16 lsflgs;
 } __attribute__((packed));
 
 struct nsp_data_opt_msg1
 {
-        unsigned short  acknum;
-        unsigned short  segnum;
+        __le16 acknum;
+        __le16 segnum;
 } __attribute__((packed));
 
 
 /* Acknowledgment Message (data/other data)                             */
 struct nsp_data_ack_msg
 {
-        unsigned char   msgflg;
-        unsigned short  dstaddr;
-        unsigned short  srcaddr;
-        unsigned short  acknum;
+        __u8   msgflg;
+        __le16 dstaddr;
+        __le16 srcaddr;
+        __le16 acknum;
 } __attribute__((packed));
 
 /* Connect Acknowledgment Message */
 struct  nsp_conn_ack_msg
 {
-        unsigned char   msgflg;
-        unsigned short  dstaddr;
+        __u8 msgflg;
+        __le16 dstaddr;
 } __attribute__((packed));
 
 
 /* Connect Initiate/Retransmit Initiate/Connect Confirm */
 struct  nsp_conn_init_msg
 {
-        unsigned char   msgflg;
+        __u8   msgflg;
 #define NSP_CI      0x18            /* Connect Initiate     */
 #define NSP_RCI     0x68            /* Retrans. Conn Init   */
-        unsigned short  dstaddr;
-        unsigned short  srcaddr;
-        unsigned char   services;
+        __le16 dstaddr;
+        __le16 srcaddr;
+        __u8   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;
-        unsigned short  segsize;
+        __u8   info;
+        __le16 segsize;
 } __attribute__((packed));
 
 /* Disconnect Initiate/Disconnect Confirm */
 struct  nsp_disconn_init_msg
 {
-        unsigned char   msgflg;
-        unsigned short  dstaddr;
-        unsigned short  srcaddr;
-        unsigned short  reason;
+        __u8   msgflg;
+        __le16 dstaddr;
+        __le16 srcaddr;
+        __le16 reason;
 } __attribute__((packed));
 
 
 
 struct  srcobj_fmt
 {
-        char            format;
-        unsigned char   task;
-        unsigned short  grpcode;
-        unsigned short  usrcode;
-        char            dlen;
+        __u8   format;
+        __u8   task;
+        __le16 grpcode;
+        __le16 usrcode;
+        __u8   dlen;
 } __attribute__((packed));
 
 /*
@@ -150,7 +150,7 @@ struct  srcobj_fmt
  * numbers used in NSP. Similar in operation to the functions
  * of the same name in TCP.
  */
-static __inline__ int dn_before(unsigned short seq1, unsigned short seq2)
+static __inline__ int dn_before(__u16 seq1, __u16 seq2)
 {
         seq1 &= 0x0fff;
         seq2 &= 0x0fff;
@@ -159,7 +159,7 @@ static __inline__ int dn_before(unsigned short seq1, unsigned short seq2)
 }
 
 
-static __inline__ int dn_after(unsigned short seq1, unsigned short seq2)
+static __inline__ int dn_after(__u16 seq1, __u16 seq2)
 {
         seq1 &= 0x0fff;
         seq2 &= 0x0fff;
@@ -167,23 +167,23 @@ static __inline__ int dn_after(unsigned short seq1, unsigned short seq2)
         return (int)((seq2 - seq1) & 0x0fff) > 2048;
 }
 
-static __inline__ int dn_equal(unsigned short seq1, unsigned short seq2)
+static __inline__ int dn_equal(__u16 seq1, __u16 seq2)
 {
         return ((seq1 ^ seq2) & 0x0fff) == 0;
 }
 
-static __inline__ int dn_before_or_equal(unsigned short seq1, unsigned short seq2)
+static __inline__ int dn_before_or_equal(__u16 seq1, __u16 seq2)
 {
         return (dn_before(seq1, seq2) || dn_equal(seq1, seq2));
 }
 
-static __inline__ void seq_add(unsigned short *seq, unsigned short off)
+static __inline__ void seq_add(__u16 *seq, __u16 off)
 {
         (*seq) += off;
         (*seq) &= 0x0fff;
 }
 
-static __inline__ int seq_next(unsigned short seq1, unsigned short seq2)
+static __inline__ int seq_next(__u16 seq1, __u16 seq2)
 {
         return dn_equal(seq1 + 1, seq2);
 }
@@ -191,7 +191,7 @@ static __inline__ int seq_next(unsigned short seq1, unsigned short seq2)
 /*
  * Can we delay the ack ?
  */
-static __inline__ int sendack(unsigned short seq)
+static __inline__ int sendack(__u16 seq)
 {
         return (int)((seq & 0x1000) ? 0 : 1);
 }
diff --git a/include/net/dn_route.h b/include/net/dn_route.h
index 5122da3f2eb3..76f957e258b0 100644
--- a/include/net/dn_route.h
+++ b/include/net/dn_route.h
@@ -71,12 +71,12 @@ struct dn_route {
                 struct dn_route *rt_next;
         } u;
 
-        __u16 rt_saddr;
-        __u16 rt_daddr;
-        __u16 rt_gateway;
-        __u16 rt_local_src;     /* Source used for forwarding packets */
-        __u16 rt_src_map;
-        __u16 rt_dst_map;
+        __le16 rt_saddr;
+        __le16 rt_daddr;
+        __le16 rt_gateway;
+        __le16 rt_local_src;    /* Source used for forwarding packets */
+        __le16 rt_src_map;
+        __le16 rt_dst_map;
 
         unsigned rt_flags;
         unsigned rt_type;
diff --git a/include/net/flow.h b/include/net/flow.h
index ec7eb86eb203..04d89f763451 100644
--- a/include/net/flow.h
+++ b/include/net/flow.h
@@ -30,8 +30,8 @@ struct flowi {
                 } ip6_u;
 
                 struct {
-                        __u16                   daddr;
-                        __u16                   saddr;
+                        __le16                  daddr;
+                        __le16                  saddr;
                         __u32                   fwmark;
                         __u8                    scope;
                 } dn_u;
@@ -64,8 +64,8 @@ struct flowi {
                 } icmpt;
 
                 struct {
-                        __u16   sport;
-                        __u16   dport;
+                        __le16  sport;
+                        __le16  dport;
                         __u8    objnum;
                         __u8    objnamel; /* Not 16 bits since max val is 16 */
                         __u8    objname[16]; /* Not zero terminated */