From patchwork Wed Aug 6 22:17:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 377670 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 18D331400D6 for ; Thu, 7 Aug 2014 08:17:10 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754119AbaHFWRH (ORCPT ); Wed, 6 Aug 2014 18:17:07 -0400 Received: from mail.us.es ([193.147.175.20]:54239 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753927AbaHFWRF (ORCPT ); Wed, 6 Aug 2014 18:17:05 -0400 Received: (qmail 19714 invoked from network); 7 Aug 2014 00:17:04 +0200 Received: from unknown (HELO us.es) (192.168.2.11) by us.es with SMTP; 7 Aug 2014 00:17:04 +0200 Received: (qmail 19758 invoked by uid 507); 6 Aug 2014 22:17:04 -0000 X-Qmail-Scanner-Diagnostics: from 127.0.0.1 by antivirus1 (envelope-from , uid 501) with qmail-scanner-2.10 (clamdscan: 0.98.4/19266. spamassassin: 3.3.2. Clear:RC:1(127.0.0.1):SA:0(-102.8/7.5):. Processed in 2.27208 secs); 06 Aug 2014 22:17:04 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on antivirus1 X-Spam-Level: X-Spam-Status: No, score=-102.8 required=7.5 tests=BAYES_50,RDNS_NONE, SMTPAUTH_US,USER_IN_WHITELIST autolearn=disabled version=3.3.2 X-Spam-ASN: AS12715 213.179.96.0/19 X-Envelope-From: pablo@netfilter.org Received: from unknown (HELO antivirus1) (127.0.0.1) by us.es with SMTP; 6 Aug 2014 22:17:02 -0000 Received: from 192.168.1.13 (192.168.1.13) by antivirus1 (F-Secure/fsigk_smtp/412/antivirus1); Thu, 07 Aug 2014 00:17:02 +0200 (CEST) X-Virus-Status: clean(F-Secure/fsigk_smtp/412/antivirus1) Received: (qmail 827 invoked from network); 7 Aug 2014 00:17:00 +0200 Received: from unknown (HELO localhost.localdomain) (pneira@us.es@213.179.122.18) by mail.us.es with SMTP; 7 Aug 2014 00:17:00 +0200 From: Pablo Neira Ayuso To: therbert@google.com Cc: netfilter-devel@vger.kernel.org, davem@davemloft.net, davej@redhat.com, netdev@vger.kernel.org Subject: [PATCH v2] net: reallocate new socket option number for IPV6_AUTOFLOWLABEL Date: Thu, 7 Aug 2014 00:17:09 +0200 Message-Id: <1407363429-3870-1-git-send-email-pablo@netfilter.org> X-Mailer: git-send-email 1.7.10.4 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org cb1ce2e ("ipv6: Implement automatic flow label generation on transmit") accidentally uses socket option 64, which is already used by ip6tables: IP6T_SO_SET_REPLACE / IP6T_SO_GET_INFO 64 IP6T_SO_SET_ADD_COUNTERS / IP6T_SO_GET_ENTRIES 65 There is comment include/uapi/linux/in6.h warning about that. Allocate 70 for this, which seems to be unused instead. Cc: Tom Herbert Signed-off-by: Pablo Neira Ayuso --- include/uapi/linux/in6.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/uapi/linux/in6.h b/include/uapi/linux/in6.h index 22b7a69..74a2a17 100644 --- a/include/uapi/linux/in6.h +++ b/include/uapi/linux/in6.h @@ -233,7 +233,6 @@ struct in6_flowlabel_req { #if 0 /* not yet */ #define IPV6_USE_MIN_MTU 63 #endif -#define IPV6_AUTOFLOWLABEL 64 /* * Netfilter (1) @@ -262,6 +261,7 @@ struct in6_flowlabel_req { * IP6T_SO_ORIGINAL_DST 80 */ +#define IPV6_AUTOFLOWLABEL 70 /* RFC5014: Source address selection */ #define IPV6_ADDR_PREFERENCES 72