]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
in6: fix conflict with glibc
authorstephen hemminger <stephen@networkplumber.org>
Sat, 20 Dec 2014 20:15:49 +0000 (12:15 -0800)
committerJiri Slaby <jslaby@suse.cz>
Mon, 26 Jan 2015 13:39:14 +0000 (14:39 +0100)
commitef260858f4bdef913410e825b1f9590a0b9db213
treec99bb22442599f21396f50b007e58454f390b54f
parentd7ab02d6e980a50530a2f92056b653de1c114285
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: Jiri Slaby <jslaby@suse.cz>
include/uapi/linux/in6.h
include/uapi/linux/libc-compat.h