From 18d099aa74b58bd7c68bd9f6c08fdcd21eaa17a1 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Wed, 20 Sep 2006 12:02:21 -0700 Subject: [PATCH] --- yaml --- r: 34709 b: refs/heads/master c: 7cf73936fe6bb9b027b75fd8fa3c634fe74843d3 h: refs/heads/master i: 34707: ac70b23865354af8d3c8e6043b517cd8760d2791 v: v3 --- [refs] | 2 +- trunk/net/ipv6/netfilter/ip6t_HL.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 7218ce7a11f6..36f0823f825b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ca39df6cdfbe2ea210e31117f5d469576cfe9008 +refs/heads/master: 7cf73936fe6bb9b027b75fd8fa3c634fe74843d3 diff --git a/trunk/net/ipv6/netfilter/ip6t_HL.c b/trunk/net/ipv6/netfilter/ip6t_HL.c index e54ea92d107b..435750f664dd 100644 --- a/trunk/net/ipv6/netfilter/ip6t_HL.c +++ b/trunk/net/ipv6/netfilter/ip6t_HL.c @@ -26,7 +26,6 @@ static unsigned int ip6t_hl_target(struct sk_buff **pskb, { struct ipv6hdr *ip6h; const struct ip6t_HL_info *info = targinfo; - u_int16_t diffs[2]; int new_hl; if (!skb_make_writable(pskb, (*pskb)->len)) @@ -53,11 +52,8 @@ static unsigned int ip6t_hl_target(struct sk_buff **pskb, break; } - if (new_hl != ip6h->hop_limit) { - diffs[0] = htons(((unsigned)ip6h->hop_limit) << 8) ^ 0xFFFF; + if (new_hl != ip6h->hop_limit) ip6h->hop_limit = new_hl; - diffs[1] = htons(((unsigned)ip6h->hop_limit) << 8); - } return IP6T_CONTINUE; }