From: Pablo Neira <pablo@netfilter.org>
Date: Wed, 6 Aug 2014 22:17:09 +0000 (+0200)
Subject: net: reallocate new socket option number for IPV6_AUTOFLOWLABEL
X-Git-Tag: omap-for-v3.17/fixes-against-rc2~138^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=753a2ad54ef45e3417a9d49537c2b42b04a2e1be;p=pandora-kernel.git

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@google.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

Reading git-diff-tree failed