From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932131AbbILXMx (ORCPT ); Sat, 12 Sep 2015 19:12:53 -0400 Received: from wtarreau.pck.nerim.net ([62.212.114.60]:9314 "EHLO 1wt.eu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932067AbbILXMs (ORCPT ); Sat, 12 Sep 2015 19:12:48 -0400 Message-Id: <20150912225609.245725041@1wt.eu> User-Agent: quilt/0.63-1 Date: Sun, 13 Sep 2015 00:57:08 +0200 From: Willy Tarreau To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "David S. Miller" , Willy Tarreau Subject: [PATCH 2.6.32 62/62] ipv6: Fix return of xfrm6_tunnel_rcv() MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 In-Reply-To: <08d3b586eb2e764308c3de9ee398a17c@local> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.32-longterm review patch. If anyone has any objections, please let me know. ------------------ From: "David S. Miller" Like ipv4, just return xfrm6_rcv_spi()'s return value directly. Signed-off-by: David S. Miller (cherry picked from commit 6ac3f6649223d916bbdf1e823926f8f3b34b5d99) Signed-off-by: Willy Tarreau --- net/ipv6/xfrm6_tunnel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c index 48bb1e3..5980e6e 100644 --- a/net/ipv6/xfrm6_tunnel.c +++ b/net/ipv6/xfrm6_tunnel.c @@ -258,7 +258,7 @@ static int xfrm6_tunnel_rcv(struct sk_buff *skb) __be32 spi; spi = xfrm6_tunnel_spi_lookup((xfrm_address_t *)&iph->saddr); - return xfrm6_rcv_spi(skb, IPPROTO_IPV6, spi) > 0 ? : 0; + return xfrm6_rcv_spi(skb, IPPROTO_IPV6, spi); } static int xfrm6_tunnel_err(struct sk_buff *skb, struct inet6_skb_parm *opt, -- 1.7.12.2.21.g234cd45.dirty