diff options
author | Ulrich Weber <uweber@astaro.com> | 2010-02-25 18:28:58 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-26 06:59:07 -0500 |
commit | 45bb00609022ecf1d97e083666c68c74d237b799 (patch) | |
tree | 9d8d632a9c2671ab9487ed1d73b8dc45de48b90b /net/ipv6/addrconf.c | |
parent | 1d9cfc4e354cd619d92bb938657dec3c533e6929 (diff) |
ipv6: Remove IPV6_ADDR_RESERVED
RFC 4291 section 2.4 states that all uncategorized addresses
should be considered as Global Unicast.
This will remove IPV6_ADDR_RESERVED completely
and return IPV6_ADDR_UNICAST in ipv6_addr_type() instead.
Signed-off-by: Ulrich Weber <uweber@astaro.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/addrconf.c')
-rw-r--r-- | net/ipv6/addrconf.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 1b327f15e7e7..88fd8c5877ee 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
@@ -992,8 +992,7 @@ struct ipv6_saddr_dst { | |||
992 | 992 | ||
993 | static inline int ipv6_saddr_preferred(int type) | 993 | static inline int ipv6_saddr_preferred(int type) |
994 | { | 994 | { |
995 | if (type & (IPV6_ADDR_MAPPED|IPV6_ADDR_COMPATv4| | 995 | if (type & (IPV6_ADDR_MAPPED|IPV6_ADDR_COMPATv4|IPV6_ADDR_LOOPBACK)) |
996 | IPV6_ADDR_LOOPBACK|IPV6_ADDR_RESERVED)) | ||
997 | return 1; | 996 | return 1; |
998 | return 0; | 997 | return 0; |
999 | } | 998 | } |