in6: fix conflict with glibc
authorstephen hemminger <stephen@networkplumber.org>
Sat, 20 Dec 2014 20:15:49 +0000 (12:15 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 22 Dec 2014 21:12:36 +0000 (16:12 -0500)
commit6d08acd2d32e3e877579315dc3202d7a5f336d98
tree9a0e87d08117275b86f561139082e36272670a8d
parentc51ed18257e731e15541324cd58bd3761d9d3b1c
in6: fix conflict with glibc

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>
include/uapi/linux/in6.h
include/uapi/linux/libc-compat.h