Merge branches 'topic/fix/misc' and 'topic/fix/hda' into for-linus

[mv-sheeva.git] / include / linux / netfilter_bridge / ebt_among.h

diff --git a/include/linux/netfilter_bridge/ebt_among.h b/include/linux/netfilter_bridge/ebt_among.h
index 307c1fed8511e202872056bd8448ff8cacca2ce7..7654069233ca36f45ae693d6e61f008d3d15f4b5 100644 (file)
--- a/include/linux/netfilter_bridge/ebt_among.h
+++ b/include/linux/netfilter_bridge/ebt_among.h
@@ -32,7 +32,7 @@
 struct ebt_mac_wormhash_tuple
 {
        uint32_t cmp[2];
-       uint32_t ip;
+       __be32 ip;
 };
 
 struct ebt_mac_wormhash