aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/arcnet
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/arcnet')
-rw-r--r--drivers/net/arcnet/rfc1051.c4
-rw-r--r--drivers/net/arcnet/rfc1201.c6
2 files changed, 5 insertions, 5 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;