netfilter endian regressions

no real bugs, just misannotations cropping up

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2 files changed, 3 insertions, 2 deletions

diff --git a/net/ipv4/netfilter/nf_nat_core.c b/net/ipv4/netfilter/nf_nat_core.c
index e848d8d6292..deab27facba 100644
--- a/net/ipv4/netfilter/nf_nat_core.c
+++ b/net/ipv4/netfilter/nf_nat_core.c
@@ -77,7 +77,8 @@ static inline unsigned int
 hash_by_src(const struct nf_conntrack_tuple *tuple)
 {
         /* Original src, to ensure we map it consistently if poss. */
-        return jhash_3words((__force u32)tuple->src.u3.ip, tuple->src.u.all,
+        return jhash_3words((__force u32)tuple->src.u3.ip,
+                            (__force u32)tuple->src.u.all,
                             tuple->dst.protonum, 0) % nf_nat_htable_size;
 }
 
diff --git a/net/ipv4/netfilter/nf_nat_rule.c b/net/ipv4/netfilter/nf_nat_rule.c
index 0f45427e5fd..76ec59ae524 100644
--- a/net/ipv4/netfilter/nf_nat_rule.c
+++ b/net/ipv4/netfilter/nf_nat_rule.c
@@ -192,7 +192,7 @@ alloc_null_binding_confirmed(struct nf_conn *ct, unsigned int hooknum)
                 = (HOOK2MANIP(hooknum) == IP_NAT_MANIP_SRC
                    ? ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip
                    : ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u3.ip);
-        u_int16_t all
+        __be16 all
                 = (HOOK2MANIP(hooknum) == IP_NAT_MANIP_SRC
                    ? ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u.all
                    : ct->tuplehash[IP_CT_DIR_REPLY].tuple.src.u.all);