]> git.hungrycats.org Git - linux/commit
in6: fix conflict with glibc
authorstephen hemminger <stephen@networkplumber.org>
Sat, 20 Dec 2014 20:15:49 +0000 (12:15 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 27 Jan 2015 16:29:33 +0000 (08:29 -0800)
commitb7efdb64acc4acd4213d6577c202e84294b31ca4
tree8ac638cd8e27d12a6360b0c706ffc548493e3a8f
parent3614d566f7d018a4f3667ecb75c029140664d8e0
in6: fix conflict with glibc

[ Upstream commit 6d08acd2d32e3e877579315dc3202d7a5f336d98 ]

Resolve conflicts between glibc definition of IPV6 socket options
and those defined in Linux headers. Looks like earlier efforts to
solve this did not cover all the definitions.

It resolves warnings during iproute2 build.
Please consider for stable as well.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
include/uapi/linux/in6.h
include/uapi/linux/libc-compat.h