Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[linux-2.6] / include / linux / netfilter / xt_conntrack.h

diff --git a/include/linux/netfilter/xt_conntrack.h b/include/linux/netfilter/xt_conntrack.h
index 4c2d9945ca54a50034d488ce8e472e404bafed9b..70b6f718cf4cbe5fa48d51725a7d00f4fdf55054 100644 (file)
--- a/include/linux/netfilter/xt_conntrack.h
+++ b/include/linux/netfilter/xt_conntrack.h
@@ -29,14 +29,14 @@
 struct ip_conntrack_old_tuple
 {
        struct {
-               __u32 ip;
+               __be32 ip;
                union {
                        __u16 all;
                } u;
        } src;
 
        struct {
-               __u32 ip;
+               __be32 ip;
                union {
                        __u16 all;
                } u;