From patchwork Sun Dec 8 14:47:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florent Fourcot X-Patchwork-Id: 298838 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 2E5882C0086 for ; Mon, 9 Dec 2013 01:47:29 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759321Ab3LHOrZ (ORCPT ); Sun, 8 Dec 2013 09:47:25 -0500 Received: from fourcot.fr ([217.70.191.14]:57314 "EHLO olfflo.fourcot.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759243Ab3LHOrO (ORCPT ); Sun, 8 Dec 2013 09:47:14 -0500 Received: from reglisse.fourcot.fr (unknown [IPv6:2001:470:51a3:666:8a5d:56f6:471f:b138]) (Authenticated sender: reglisse) by olfflo.fourcot.fr (Postfix) with ESMTPSA id A3B7F2DFA4; Sun, 8 Dec 2013 15:47:13 +0100 (CET) Received: by reglisse.fourcot.fr (Postfix, from userid 1000) id 214F977D5BE; Sun, 8 Dec 2013 15:47:13 +0100 (CET) From: Florent Fourcot To: netdev@vger.kernel.org Cc: Florent Fourcot Subject: [PATCH net-next 5/5] ipv6: use ip6_flowinfo helper Date: Sun, 8 Dec 2013 15:47:01 +0100 Message-Id: <1386514021-11646-5-git-send-email-florent.fourcot@enst-bretagne.fr> X-Mailer: git-send-email 1.8.4.3 In-Reply-To: <1386514021-11646-1-git-send-email-florent.fourcot@enst-bretagne.fr> References: <1386514021-11646-1-git-send-email-florent.fourcot@enst-bretagne.fr> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Florent Fourcot Reviewed-by: Hannes Frederic Sowa --- net/ipv6/af_inet6.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index 4fbdb70..027615a 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c @@ -683,8 +683,7 @@ bool ipv6_opt_accepted(const struct sock *sk, const struct sk_buff *skb) if (np->rxopt.all) { if ((opt->hop && (np->rxopt.bits.hopopts || np->rxopt.bits.ohopopts)) || - ((IPV6_FLOWINFO_MASK & - *(__be32 *)skb_network_header(skb)) && + (ip6_flowinfo((struct ipv6hdr *) skb_network_header(skb)) && np->rxopt.bits.rxflow) || (opt->srcrt && (np->rxopt.bits.srcrt || np->rxopt.bits.osrcrt)) ||