From patchwork Sun Dec 8 14:46:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florent Fourcot X-Patchwork-Id: 298836 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 91C7D2C00C9 for ; Mon, 9 Dec 2013 01:47:20 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759306Ab3LHOrT (ORCPT ); Sun, 8 Dec 2013 09:47:19 -0500 Received: from fourcot.fr ([217.70.191.14]:57309 "EHLO olfflo.fourcot.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758861Ab3LHOrM (ORCPT ); Sun, 8 Dec 2013 09:47:12 -0500 Received: from reglisse.fourcot.fr (drsd-4dbd876c.pool.mediaWays.net [77.189.135.108]) (Authenticated sender: reglisse) by olfflo.fourcot.fr (Postfix) with ESMTPSA id A2D552E034; Sun, 8 Dec 2013 15:47:11 +0100 (CET) Received: by reglisse.fourcot.fr (Postfix, from userid 1000) id 314E177D5B8; Sun, 8 Dec 2013 15:47:11 +0100 (CET) From: Florent Fourcot To: netdev@vger.kernel.org Cc: Florent Fourcot Subject: [PATCH net-next 2/5] ipv6: move IPV6_TCLASS_MASK definition in ipv6.h Date: Sun, 8 Dec 2013 15:46:58 +0100 Message-Id: <1386514021-11646-2-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 --- include/net/ipv6.h | 1 + net/ipv6/ip6_gre.c | 1 - net/ipv6/ip6_tunnel.c | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/include/net/ipv6.h b/include/net/ipv6.h index eb198ac..f0edf00 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h @@ -237,6 +237,7 @@ struct ip6_flowlabel { #define IPV6_FLOWINFO_MASK cpu_to_be32(0x0FFFFFFF) #define IPV6_FLOWLABEL_MASK cpu_to_be32(0x000FFFFF) +#define IPV6_TCLASS_MASK (IPV6_FLOWINFO_MASK & ~IPV6_FLOWLABEL_MASK) struct ipv6_fl_socklist { struct ipv6_fl_socklist __rcu *next; diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index 8acb286..c50de06 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -61,7 +61,6 @@ static bool log_ecn_error = true; module_param(log_ecn_error, bool, 0644); MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN"); -#define IPV6_TCLASS_MASK (IPV6_FLOWINFO_MASK & ~IPV6_FLOWLABEL_MASK) #define IPV6_TCLASS_SHIFT 20 #define HASH_SIZE_SHIFT 5 diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index d606232..f5e8a98 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -70,7 +70,6 @@ MODULE_ALIAS_NETDEV("ip6tnl0"); #define IP6_TNL_TRACE(x...) do {;} while(0) #endif -#define IPV6_TCLASS_MASK (IPV6_FLOWINFO_MASK & ~IPV6_FLOWLABEL_MASK) #define IPV6_TCLASS_SHIFT 20 #define HASH_SIZE_SHIFT 5