Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Al Viro 2007-08-22 22:59:11 -04:00 коммит произвёл David S. Miller
Родитель 05d2fec9f5
Коммит 701181ac1d
4 изменённых файлов: 8 добавлений и 8 удалений

Просмотреть файл

@ -34,7 +34,7 @@
#define VERSION "arcnet: RFC1051 \"simple standard\" (`s') encapsulation support loaded.\n" #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, static void rx(struct net_device *dev, int bufnum,
struct archdr *pkthdr, int length); struct archdr *pkthdr, int length);
static int build_header(struct sk_buff *skb, struct net_device *dev, 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. * 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 arcnet_local *lp = dev->priv;
struct archdr *pkt = (struct archdr *) skb->data; struct archdr *pkt = (struct archdr *) skb->data;

Просмотреть файл

@ -34,7 +34,7 @@ MODULE_LICENSE("GPL");
#define VERSION "arcnet: RFC1201 \"standard\" (`a') encapsulation support loaded.\n" #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, static void rx(struct net_device *dev, int bufnum,
struct archdr *pkthdr, int length); struct archdr *pkthdr, int length);
static int build_header(struct sk_buff *skb, struct net_device *dev, 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. * 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 archdr *pkt = (struct archdr *) skb->data;
struct arc_rfc1201 *soft = &pkt->soft.rfc1201; 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.proto = soft->proto;
excsoft.split_flag = 0xff; excsoft.split_flag = 0xff;
excsoft.sequence = 0xffff; excsoft.sequence = htons(0xffff);
hard->offset[0] = 0; hard->offset[0] = 0;
ofs = 512 - softlen; ofs = 512 - softlen;

Просмотреть файл

@ -214,7 +214,7 @@ extern struct ArcProto *arc_proto_map[256], *arc_proto_default,
*/ */
struct Incoming { struct Incoming {
struct sk_buff *skb; /* packet data buffer */ 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) */ uint8_t lastpacket, /* number of last packet (from 1) */
numpackets; /* number of packets in split */ numpackets; /* number of packets in split */
}; };
@ -292,7 +292,7 @@ struct arcnet_local {
struct { struct {
uint16_t sequence; /* sequence number (incs with each packet) */ uint16_t sequence; /* sequence number (incs with each packet) */
uint16_t aborted_seq; __be16 aborted_seq;
struct Incoming incoming[256]; /* one from each address */ struct Incoming incoming[256]; /* one from each address */
} rfc1201; } rfc1201;

Просмотреть файл

@ -59,7 +59,7 @@ struct arc_rfc1201
{ {
uint8_t proto; /* protocol ID field - varies */ uint8_t proto; /* protocol ID field - varies */
uint8_t split_flag; /* for use with split packets */ 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)*/ uint8_t payload[0]; /* space remaining in packet (504 bytes)*/
}; };
#define RFC1201_HDR_SIZE 4 #define RFC1201_HDR_SIZE 4