diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2007-09-16 14:48:21 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2007-09-16 14:48:21 -0700 |
| commit | 6ae5f983cf8de769214d2d9e8a783c881eccd4cd (patch) | |
| tree | bfc249a8c92e1cbd73845b502eadb4516eb46c69 /net | |
| parent | 2a0c6c980d209827e5d69017fa736f107a744d1d (diff) | |
| download | blackbird-op-linux-6ae5f983cf8de769214d2d9e8a783c881eccd4cd.tar.gz blackbird-op-linux-6ae5f983cf8de769214d2d9e8a783c881eccd4cd.zip | |
[IPV6]: Fix source address selection.
The commit 95c385 broke proper source address selection for cases in which
there is a address which is makred 'deprecated'. The commit mistakenly
changed ifa->flags to ifa_result->flags (probably copy/paste error from a
few lines above) in the 'Rule 3' address selection code.
The patch restores the previous RFC-compliant behavior.
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/addrconf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 91ef3be5abad..45b4c82148a0 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -1021,7 +1021,7 @@ int ipv6_dev_get_saddr(struct net_device *daddr_dev, hiscore.rule++; } if (ipv6_saddr_preferred(score.addr_type) || - (((ifa_result->flags & + (((ifa->flags & (IFA_F_DEPRECATED|IFA_F_OPTIMISTIC)) == 0))) { score.attrs |= IPV6_SADDR_SCORE_PREFERRED; if (!(hiscore.attrs & IPV6_SADDR_SCORE_PREFERRED)) { |
