[Devel] [PATCH RHEL7 COMMIT] ms/net: reallocate new socket option number for IPV6_AUTOFLOWLABEL

[Vasily Averin]

The commit is pushed to "branch-rh7-3.10.0-1160.42.2.vz7.184.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-1160.42.2.vz7.184.2
------>
commit 00242aaf1972d16212fdb1aa03019eba7ff4d2ac
Author: Pablo Neira <pablo at netfilter.org>
Date:   Tue Oct 26 14:26:09 2021 +0300

    ms/net: reallocate new socket option number for IPV6_AUTOFLOWLABEL
    
    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 <therbert at google.com>
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
    Signed-off-by: David S. Miller <davem at davemloft.net>
    (cherry picked from commit 753a2ad54ef45e3417a9d49537c2b42b04a2e1be)
    https://pmc.acronis.com/browse/VSTOR-47671
    Signed-off-by: Vasily Averin <vvs at virtuozzo.com>
---
 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 64bb863..cef3ba7 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