aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/arcnet/rfc1051.c4
-rw-r--r--drivers/net/arcnet/rfc1201.c6
-rw-r--r--include/linux/arcdevice.h4
-rw-r--r--include/linux/if_arcnet.h2
4 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/arcnet/rfc1051.c b/drivers/net/arcnet/rfc1051.c
index 2de8877ece29..dab185bc51f1 100644
--- a/drivers/net/arcnet/rfc1051.c
+++ b/drivers/net/arcnet/rfc1051.c
@@ -34,7 +34,7 @@
34#define VERSION "arcnet: RFC1051 \"simple standard\" (`s') encapsulation support loaded.\n" 34#define VERSION "arcnet: RFC1051 \"simple standard\" (`s') encapsulation support loaded.\n"
35 35
36 36
37static unsigned short type_trans(struct sk_buff *skb, struct net_device *dev); 37static __be16 type_trans(struct sk_buff *skb, struct net_device *dev);
38static void rx(struct net_device *dev, int bufnum, 38static void rx(struct net_device *dev, int bufnum,
39 struct archdr *pkthdr, int length); 39 struct archdr *pkthdr, int length);
40static int build_header(struct sk_buff *skb, struct net_device *dev, 40static int build_header(struct sk_buff *skb, struct net_device *dev,
@@ -86,7 +86,7 @@ MODULE_LICENSE("GPL");
86 * 86 *
87 * With ARCnet we have to convert everything to Ethernet-style stuff. 87 * With ARCnet we have to convert everything to Ethernet-style stuff.
88 */ 88 */
89static unsigned short type_trans(struct sk_buff *skb, struct net_device *dev) 89static __be16 type_trans(struct sk_buff *skb, struct net_device *dev)
90{ 90{
91 struct arcnet_local *lp = dev->priv; 91 struct arcnet_local *lp = dev->priv;
92 struct archdr *pkt = (struct archdr *) skb->data; 92 struct archdr *pkt = (struct archdr *) skb->data;
diff --git a/drivers/net/arcnet/rfc1201.c b/drivers/net/arcnet/rfc1201.c
index 460a095000c2..6d6d95cc4404 100644
--- a/drivers/net/arcnet/rfc1201.c
+++ b/drivers/net/arcnet/rfc1201.c
@@ -34,7 +34,7 @@ MODULE_LICENSE("GPL");
34#define VERSION "arcnet: RFC1201 \"standard\" (`a') encapsulation support loaded.\n" 34#define VERSION "arcnet: RFC1201 \"standard\" (`a') encapsulation support loaded.\n"
35 35
36 36
37static unsigned short type_trans(struct sk_buff *skb, struct net_device *dev); 37static __be16 type_trans(struct sk_buff *skb, struct net_device *dev);
38static void rx(struct net_device *dev, int bufnum, 38static void rx(struct net_device *dev, int bufnum,
39 struct archdr *pkthdr, int length); 39 struct archdr *pkthdr, int length);
40static int build_header(struct sk_buff *skb, struct net_device *dev, 40static int build_header(struct sk_buff *skb, struct net_device *dev,
@@ -88,7 +88,7 @@ module_exit(arcnet_rfc1201_exit);
88 * 88 *
89 * With ARCnet we have to convert everything to Ethernet-style stuff. 89 * With ARCnet we have to convert everything to Ethernet-style stuff.
90 */ 90 */
91static unsigned short type_trans(struct sk_buff *skb, struct net_device *dev) 91static __be16 type_trans(struct sk_buff *skb, struct net_device *dev)
92{ 92{
93 struct archdr *pkt = (struct archdr *) skb->data; 93 struct archdr *pkt = (struct archdr *) skb->data;
94 struct arc_rfc1201 *soft = &pkt->soft.rfc1201; 94 struct arc_rfc1201 *soft = &pkt->soft.rfc1201;
@@ -456,7 +456,7 @@ static void load_pkt(struct net_device *dev, struct arc_hardware *hard,
456 456
457 excsoft.proto = soft->proto; 457 excsoft.proto = soft->proto;
458 excsoft.split_flag = 0xff; 458 excsoft.split_flag = 0xff;
459 excsoft.sequence = 0xffff; 459 excsoft.sequence = htons(0xffff);
460 460
461 hard->offset[0] = 0; 461 hard->offset[0] = 0;
462 ofs = 512 - softlen; 462 ofs = 512 - softlen;
diff --git a/include/linux/arcdevice.h b/include/linux/arcdevice.h
index 2f85049cfb3d..fde675872c56 100644
--- a/include/linux/arcdevice.h
+++ b/include/linux/arcdevice.h
@@ -214,7 +214,7 @@ extern struct ArcProto *arc_proto_map[256], *arc_proto_default,
214 */ 214 */
215struct Incoming { 215struct Incoming {
216 struct sk_buff *skb; /* packet data buffer */ 216 struct sk_buff *skb; /* packet data buffer */
217 uint16_t sequence; /* sequence number of assembly */ 217 __be16 sequence; /* sequence number of assembly */
218 uint8_t lastpacket, /* number of last packet (from 1) */ 218 uint8_t lastpacket, /* number of last packet (from 1) */
219 numpackets; /* number of packets in split */ 219 numpackets; /* number of packets in split */
220}; 220};
@@ -292,7 +292,7 @@ struct arcnet_local {
292 292
293 struct { 293 struct {
294 uint16_t sequence; /* sequence number (incs with each packet) */ 294 uint16_t sequence; /* sequence number (incs with each packet) */
295 uint16_t aborted_seq; 295 __be16 aborted_seq;
296 296
297 struct Incoming incoming[256]; /* one from each address */ 297 struct Incoming incoming[256]; /* one from each address */
298 } rfc1201; 298 } rfc1201;
diff --git a/include/linux/if_arcnet.h b/include/linux/if_arcnet.h
index af380cb876a0..27ea2ac445ad 100644
--- a/include/linux/if_arcnet.h
+++ b/include/linux/if_arcnet.h
@@ -59,7 +59,7 @@ struct arc_rfc1201
59{ 59{
60 uint8_t proto; /* protocol ID field - varies */ 60 uint8_t proto; /* protocol ID field - varies */
61 uint8_t split_flag; /* for use with split packets */ 61 uint8_t split_flag; /* for use with split packets */
62 uint16_t sequence; /* sequence number */ 62 __be16 sequence; /* sequence number */
63 uint8_t payload[0]; /* space remaining in packet (504 bytes)*/ 63 uint8_t payload[0]; /* space remaining in packet (504 bytes)*/
64}; 64};
65#define RFC1201_HDR_SIZE 4 65#define RFC1201_HDR_SIZE 4