git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
printk: fix wrong format string iter for printk
[pandora-kernel.git]
/
include
/
linux
/
if_arcnet.h
diff --git
a/include/linux/if_arcnet.h
b/include/linux/if_arcnet.h
index
27ea2ac
..
0835deb
100644
(file)
--- a/
include/linux/if_arcnet.h
+++ b/
include/linux/if_arcnet.h
@@
-16,6
+16,7
@@
#ifndef _LINUX_IF_ARCNET_H
#define _LINUX_IF_ARCNET_H
#ifndef _LINUX_IF_ARCNET_H
#define _LINUX_IF_ARCNET_H
+#include <linux/types.h>
#include <linux/if_ether.h>
#include <linux/if_ether.h>
@@
-57,10
+58,10
@@
*/
struct arc_rfc1201
{
*/
struct arc_rfc1201
{
-
uint8_t proto;
/* protocol ID field - varies */
-
uint8_t split_flag;
/* for use with split packets */
+
__u8 proto;
/* protocol ID field - varies */
+
__u8 split_flag;
/* for use with split packets */
__be16 sequence; /* sequence number */
__be16 sequence; /* sequence number */
-
uint8_t payload[0];
/* space remaining in packet (504 bytes)*/
+
__u8 payload[0];
/* space remaining in packet (504 bytes)*/
};
#define RFC1201_HDR_SIZE 4
};
#define RFC1201_HDR_SIZE 4
@@
-70,8
+71,8
@@
struct arc_rfc1201
*/
struct arc_rfc1051
{
*/
struct arc_rfc1051
{
-
uint8_t proto;
/* ARC_P_RFC1051_ARP/RFC1051_IP */
-
uint8_t payload[0];
/* 507 bytes */
+
__u8 proto;
/* ARC_P_RFC1051_ARP/RFC1051_IP */
+
__u8 payload[0];
/* 507 bytes */
};
#define RFC1051_HDR_SIZE 1
};
#define RFC1051_HDR_SIZE 1
@@
-82,20
+83,20
@@
struct arc_rfc1051
*/
struct arc_eth_encap
{
*/
struct arc_eth_encap
{
-
uint8_t proto;
/* Always ARC_P_ETHER */
+
__u8 proto;
/* Always ARC_P_ETHER */
struct ethhdr eth; /* standard ethernet header (yuck!) */
struct ethhdr eth; /* standard ethernet header (yuck!) */
-
uint8_t payload[0];
/* 493 bytes */
+
__u8 payload[0];
/* 493 bytes */
};
#define ETH_ENCAP_HDR_SIZE 14
struct arc_cap
{
};
#define ETH_ENCAP_HDR_SIZE 14
struct arc_cap
{
-
uint8_t
proto;
-
uint8_t
cookie[sizeof(int)]; /* Actually NOT sent over the network */
+
__u8
proto;
+
__u8
cookie[sizeof(int)]; /* Actually NOT sent over the network */
union {
union {
-
uint8_t
ack;
-
uint8_t raw[0];
/* 507 bytes */
+
__u8
ack;
+
__u8 raw[0];
/* 507 bytes */
} mes;
};
} mes;
};
@@
-109,7
+110,7
@@
struct arc_cap
*/
struct arc_hardware
{
*/
struct arc_hardware
{
-
uint8_t source,
/* source ARCnet - filled in automagically */
+
__u8 source,
/* source ARCnet - filled in automagically */
dest, /* destination ARCnet - 0 for broadcast */
offset[2]; /* offset bytes (some weird semantics) */
};
dest, /* destination ARCnet - 0 for broadcast */
offset[2]; /* offset bytes (some weird semantics) */
};
@@
-130,7
+131,7
@@
struct archdr
struct arc_rfc1051 rfc1051;
struct arc_eth_encap eth_encap;
struct arc_cap cap;
struct arc_rfc1051 rfc1051;
struct arc_eth_encap eth_encap;
struct arc_cap cap;
-
uint8_t raw[0];
/* 508 bytes */
+
__u8 raw[0];
/* 508 bytes */
} soft;
};
} soft;
};