diff options
| author | Ulrich Weber | 2010-02-26 00:28:58 +0100 |
|---|---|---|
| committer | David S. Miller | 2010-02-26 12:59:07 +0100 |
| commit | 45bb00609022ecf1d97e083666c68c74d237b799 (patch) | |
| tree | 9d8d632a9c2671ab9487ed1d73b8dc45de48b90b /net/ipv6/addrconf.c | |
| parent | cnic: Update version to 2.1.1. (diff) | |
| download | kernel-qcow2-linux-45bb00609022ecf1d97e083666c68c74d237b799.tar.gz kernel-qcow2-linux-45bb00609022ecf1d97e083666c68c74d237b799.tar.xz kernel-qcow2-linux-45bb00609022ecf1d97e083666c68c74d237b799.zip | |
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 { static inline int ipv6_saddr_preferred(int type) { - if (type & (IPV6_ADDR_MAPPED|IPV6_ADDR_COMPATv4| - IPV6_ADDR_LOOPBACK|IPV6_ADDR_RESERVED)) + if (type & (IPV6_ADDR_MAPPED|IPV6_ADDR_COMPATv4|IPV6_ADDR_LOOPBACK)) return 1; return 0; } |