[PATCH] gre_unique_tuple: 16/32 bit fixes
DORMANTno replies
From: Alexey Dobriyan <hidden>
Date: 2006-05-18 13:54:17
GRE keys are 16 bit. Signed-off-by: Alexey Dobriyan <redacted> --- net/ipv4/netfilter/ip_nat_proto_gre.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
--- a/net/ipv4/netfilter/ip_nat_proto_gre.c
+++ 1/net/ipv4/netfilter/ip_nat_proto_gre.c@@ -81,14 +81,14 @@ gre_unique_tuple(struct ip_conntrack_tup 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; }