arcnet endianness annotations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

diff --git a/drivers/net/arcnet/rfc1051.c b/drivers/net/arcnet/rfc1051.c
index 2de8877ece292df4e84c85e2c6ba01c58366a74b..dab185bc51f1a1bc05b3c689ed7fac5834b06c96 100644 (file)
--- a/drivers/net/arcnet/rfc1051.c
+++ b/drivers/net/arcnet/rfc1051.c
@@ -34,7 +34,7 @@
 #define VERSION "arcnet: RFC1051 \"simple standard\" (`s') encapsulation support loaded.\n"
 
 
-static unsigned short type_trans(struct sk_buff *skb, struct net_device *dev);
+static __be16 type_trans(struct sk_buff *skb, struct net_device *dev);
 static void rx(struct net_device *dev, int bufnum,
               struct archdr *pkthdr, int length);
 static int build_header(struct sk_buff *skb, struct net_device *dev,
@@ -86,7 +86,7 @@ MODULE_LICENSE("GPL");
  * 
  * With ARCnet we have to convert everything to Ethernet-style stuff.
  */
-static unsigned short type_trans(struct sk_buff *skb, struct net_device *dev)
+static __be16 type_trans(struct sk_buff *skb, struct net_device *dev)
 {
        struct arcnet_local *lp = dev->priv;
        struct archdr *pkt = (struct archdr *) skb->data;

diff --git a/drivers/net/arcnet/rfc1201.c b/drivers/net/arcnet/rfc1201.c
index 460a095000c22a756ae24274d8aeaa96db9fb07f..6d6d95cc4404b7a727a20f049dc8240db595351d 100644 (file)
--- a/drivers/net/arcnet/rfc1201.c
+++ b/drivers/net/arcnet/rfc1201.c
@@ -34,7 +34,7 @@ MODULE_LICENSE("GPL");
 #define VERSION "arcnet: RFC1201 \"standard\" (`a') encapsulation support loaded.\n"
 
 
-static unsigned short type_trans(struct sk_buff *skb, struct net_device *dev);
+static __be16 type_trans(struct sk_buff *skb, struct net_device *dev);
 static void rx(struct net_device *dev, int bufnum,
               struct archdr *pkthdr, int length);
 static int build_header(struct sk_buff *skb, struct net_device *dev,
@@ -88,7 +88,7 @@ module_exit(arcnet_rfc1201_exit);
  * 
  * With ARCnet we have to convert everything to Ethernet-style stuff.
  */
-static unsigned short type_trans(struct sk_buff *skb, struct net_device *dev)
+static __be16 type_trans(struct sk_buff *skb, struct net_device *dev)
 {
        struct archdr *pkt = (struct archdr *) skb->data;
        struct arc_rfc1201 *soft = &pkt->soft.rfc1201;
@@ -456,7 +456,7 @@ static void load_pkt(struct net_device *dev, struct arc_hardware *hard,
 
                excsoft.proto = soft->proto;
                excsoft.split_flag = 0xff;
-               excsoft.sequence = 0xffff;
+               excsoft.sequence = htons(0xffff);
 
                hard->offset[0] = 0;
                ofs = 512 - softlen;

diff --git a/include/linux/arcdevice.h b/include/linux/arcdevice.h
index 2f85049cfb3d1ca94b1b9680bf3db2802b590acf..fde675872c56407f5fdb3c8d84629a793be5b732 100644 (file)
--- a/include/linux/arcdevice.h
+++ b/include/linux/arcdevice.h
@@ -214,7 +214,7 @@ extern struct ArcProto *arc_proto_map[256], *arc_proto_default,
  */
 struct Incoming {
        struct sk_buff *skb;    /* packet data buffer             */
-       uint16_t sequence;      /* sequence number of assembly    */
+       __be16 sequence;        /* sequence number of assembly    */
        uint8_t lastpacket,     /* number of last packet (from 1) */
                numpackets;     /* number of packets in split     */
 };
@@ -292,7 +292,7 @@ struct arcnet_local {
 
        struct {
                uint16_t sequence;      /* sequence number (incs with each packet) */
-               uint16_t aborted_seq;
+               __be16 aborted_seq;
 
                struct Incoming incoming[256];  /* one from each address */
        } rfc1201;

diff --git a/include/linux/if_arcnet.h b/include/linux/if_arcnet.h
index af380cb876a05a87119e9c27af95b776555997e8..27ea2ac445ad11f727258f152e3d013bb75a96e5 100644 (file)
--- a/include/linux/if_arcnet.h
+++ b/include/linux/if_arcnet.h
@@ -59,7 +59,7 @@ struct arc_rfc1201
 {
     uint8_t  proto;            /* protocol ID field - varies           */
     uint8_t  split_flag;       /* for use with split packets           */
-    uint16_t sequence;         /* sequence number                      */
+    __be16   sequence;         /* sequence number                      */
     uint8_t  payload[0];       /* space remaining in packet (504 bytes)*/
 };
 #define RFC1201_HDR_SIZE 4