git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
include
/
linux
/
netfilter_bridge
/
ebt_arp.h
diff --git
a/include/linux/netfilter_bridge/ebt_arp.h
b/include/linux/netfilter_bridge/ebt_arp.h
index
537ec6b
..
97e4dbd
100644
(file)
--- a/
include/linux/netfilter_bridge/ebt_arp.h
+++ b/
include/linux/netfilter_bridge/ebt_arp.h
@@
-14,13
+14,13
@@
struct ebt_arp_info
{
struct ebt_arp_info
{
-
uint16_t
htype;
-
uint16_t
ptype;
-
uint16_t
opcode;
-
uint32_t
saddr;
-
uint32_t
smsk;
-
uint32_t
daddr;
-
uint32_t
dmsk;
+
__be16
htype;
+
__be16
ptype;
+
__be16
opcode;
+
__be32
saddr;
+
__be32
smsk;
+
__be32
daddr;
+
__be32
dmsk;
unsigned char smaddr[ETH_ALEN];
unsigned char smmsk[ETH_ALEN];
unsigned char dmaddr[ETH_ALEN];
unsigned char smaddr[ETH_ALEN];
unsigned char smmsk[ETH_ALEN];
unsigned char dmaddr[ETH_ALEN];