diff options
-rw-r--r-- | include/linux/in6.h | 2 | ||||
-rw-r--r-- | net/ipv6/addrconf.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/in6.h b/include/linux/in6.h index d559fac4a26d..2a61c82af115 100644 --- a/include/linux/in6.h +++ b/include/linux/in6.h | |||
@@ -44,10 +44,8 @@ struct in6_addr | |||
44 | * NOTE: Be aware the IN6ADDR_* constants and in6addr_* externals are defined | 44 | * NOTE: Be aware the IN6ADDR_* constants and in6addr_* externals are defined |
45 | * in network byte order, not in host byte order as are the IPv4 equivalents | 45 | * in network byte order, not in host byte order as are the IPv4 equivalents |
46 | */ | 46 | */ |
47 | #if 0 | ||
48 | extern const struct in6_addr in6addr_any; | 47 | extern const struct in6_addr in6addr_any; |
49 | #define IN6ADDR_ANY_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } } | 48 | #define IN6ADDR_ANY_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } } |
50 | #endif | ||
51 | extern const struct in6_addr in6addr_loopback; | 49 | extern const struct in6_addr in6addr_loopback; |
52 | #define IN6ADDR_LOOPBACK_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } } | 50 | #define IN6ADDR_LOOPBACK_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } } |
53 | 51 | ||
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index ea86bf4bfe0a..e04e49373505 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
@@ -209,9 +209,7 @@ static struct ipv6_devconf ipv6_devconf_dflt __read_mostly = { | |||
209 | }; | 209 | }; |
210 | 210 | ||
211 | /* IPv6 Wildcard Address and Loopback Address defined by RFC2553 */ | 211 | /* IPv6 Wildcard Address and Loopback Address defined by RFC2553 */ |
212 | #if 0 | ||
213 | const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT; | 212 | const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT; |
214 | #endif | ||
215 | const struct in6_addr in6addr_loopback = IN6ADDR_LOOPBACK_INIT; | 213 | const struct in6_addr in6addr_loopback = IN6ADDR_LOOPBACK_INIT; |
216 | 214 | ||
217 | static void addrconf_del_timer(struct inet6_ifaddr *ifp) | 215 | static void addrconf_del_timer(struct inet6_ifaddr *ifp) |