Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932586AbcDKN65 (ORCPT ); Mon, 11 Apr 2016 09:58:57 -0400 Received: from mx2.suse.de ([195.135.220.15]:37414 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932335AbcDKNXy (ORCPT ); Mon, 11 Apr 2016 09:23:54 -0400 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" From: Jiri Slaby To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Jiri Slaby , Luis Henriques , "David S . Miller" , Hangbin Liu Subject: [PATCH 3.12 30/98] net/ipv6: fix DEVCONF_ constants Date: Mon, 11 Apr 2016 15:22:32 +0200 Message-Id: <250998f0715ac816529de9a4f0d57667d17eff83.1460380917.git.jslaby@suse.cz> X-Mailer: git-send-email 2.8.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1983 Lines: 60 3.12-stable review patch. If anyone has any objections, please let me know. =============== In 3.12 commit e16f537864eb9cf68683d9e107706d1b31fcaa76 (net/ipv6: add sysctl option accept_ra_min_hop_limit), upstream commit 8013d1d7eafb0589ca766db6b74026f76b7f5cb4, we added DEVCONF_USE_OIF_ADDRS_ONLY and DEVCONF_ACCEPT_RA_MIN_HOP_LIMIT constants into . But they have different values to upstream because some values were added in upstream and we did not backport them. So we have: DEVCONF_SUPPRESS_FRAG_NDISC, + DEVCONF_USE_OIF_ADDRS_ONLY, + DEVCONF_ACCEPT_RA_MIN_HOP_LIMIT, DEVCONF_MAX And upstream has: DEVCONF_SUPPRESS_FRAG_NDISC, + DEVCONF_ACCEPT_RA_FROM_LOCAL, + DEVCONF_USE_OPTIMISTIC, + DEVCONF_ACCEPT_RA_MTU, + DEVCONF_STABLE_SECRET, + DEVCONF_USE_OIF_ADDRS_ONLY, + DEVCONF_ACCEPT_RA_MIN_HOP_LIMIT, DEVCONF_MAX Now, our DEVCONF_USE_OIF_ADDRS_ONLY corresponds to DEVCONF_USE_OIF_ADDRS_ONLY-4 == DEVCONF_ACCEPT_RA_FROM_LOCAL from upstream. Similarly the other constant. Fix that by simply defining the missing constants to make the values equal. Signed-off-by: Jiri Slaby Reported-by: YOSHIFUJI Hideaki Cc: Luis Henriques Cc: David S. Miller Cc: Hangbin Liu --- include/uapi/linux/ipv6.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/uapi/linux/ipv6.h b/include/uapi/linux/ipv6.h index 25955206757a..5985f28e98b3 100644 --- a/include/uapi/linux/ipv6.h +++ b/include/uapi/linux/ipv6.h @@ -163,6 +163,10 @@ enum { DEVCONF_MLDV1_UNSOLICITED_REPORT_INTERVAL, DEVCONF_MLDV2_UNSOLICITED_REPORT_INTERVAL, DEVCONF_SUPPRESS_FRAG_NDISC, + DEVCONF_ACCEPT_RA_FROM_LOCAL, + DEVCONF_USE_OPTIMISTIC, + DEVCONF_ACCEPT_RA_MTU, + DEVCONF_STABLE_SECRET, DEVCONF_USE_OIF_ADDRS_ONLY, DEVCONF_ACCEPT_RA_MIN_HOP_LIMIT, DEVCONF_MAX -- 2.8.1