From 2163552072bf414220091b42790d0e38a4c38f80 Mon Sep 17 00:00:00 2001 From: Alexey Dobriyan Date: Fri, 19 May 2006 02:16:29 -0700 Subject: [PATCH] --- yaml --- r: 26791 b: refs/heads/master c: a467704dcb4fa45da48079486f1b0e6baffb12d2 h: refs/heads/master i: 26789: cd2f26f0e9e6ff9fe925a0880c0fa26b195f3c2d 26787: c99e475cb86c91452f197a889c32f7d6c33afa51 26783: 3f03816754d36e5d02bcdbceb4187eba139635b1 v: v3 --- [refs] | 2 +- trunk/net/ipv4/netfilter/ip_nat_proto_gre.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 1f444fe57720..54805d7f9522 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5c170a09d9092e63af1658179f29867d32d56b55 +refs/heads/master: a467704dcb4fa45da48079486f1b0e6baffb12d2 diff --git a/trunk/net/ipv4/netfilter/ip_nat_proto_gre.c b/trunk/net/ipv4/netfilter/ip_nat_proto_gre.c index 6c4899d8046a..96ceabaec402 100644 --- a/trunk/net/ipv4/netfilter/ip_nat_proto_gre.c +++ b/trunk/net/ipv4/netfilter/ip_nat_proto_gre.c @@ -49,15 +49,15 @@ gre_in_range(const struct ip_conntrack_tuple *tuple, const union ip_conntrack_manip_proto *min, const union ip_conntrack_manip_proto *max) { - u_int32_t key; + __be16 key; if (maniptype == IP_NAT_MANIP_SRC) key = tuple->src.u.gre.key; else key = tuple->dst.u.gre.key; - return ntohl(key) >= ntohl(min->gre.key) - && ntohl(key) <= ntohl(max->gre.key); + return ntohs(key) >= ntohs(min->gre.key) + && ntohs(key) <= ntohs(max->gre.key); } /* generate unique tuple ... */ @@ -81,14 +81,14 @@ gre_unique_tuple(struct ip_conntrack_tuple *tuple, min = 1; range_size = 0xffff; } else { - min = ntohl(range->min.gre.key); - range_size = ntohl(range->max.gre.key) - min + 1; + min = ntohs(range->min.gre.key); + range_size = ntohs(range->max.gre.key) - min + 1; } DEBUGP("min = %u, range_size = %u\n", min, range_size); for (i = 0; i < range_size; i++, key++) { - *keyptr = htonl(min + key % range_size); + *keyptr = htons(min + key % range_size); if (!ip_nat_used_tuple(tuple, conntrack)) return 1; }