diff options
| author | Vlad Yasevich <vladislav.yasevich@hp.com> | 2009-11-10 11:57:34 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-14 06:56:50 +0300 |
| commit | 409b95aff3583c05ac7a9247fa3d8c9aa7f9cae3 (patch) | |
| tree | a8cd8135f974b8f1c6ef9d092755e1ac5b190b2f /net/sctp/associola.c | |
| parent | d792c1006fe92448217b71513d3955868358271d (diff) | |
| download | linux-409b95aff3583c05ac7a9247fa3d8c9aa7f9cae3.tar.xz | |
sctp: Set source addresses on the association before adding transports
Recent commit 8da645e101a8c20c6073efda3c7cc74eec01b87f
sctp: Get rid of an extra routing lookup when adding a transport
introduced a regression in the connection setup. The behavior was
different between IPv4 and IPv6. IPv4 case ended up working because the
route lookup routing returned a NULL route, which triggered another
route lookup later in the output patch that succeeded. In the IPv6 case,
a valid route was returned for first call, but we could not find a valid
source address at the time since the source addresses were not set on the
association yet. Thus resulted in a hung connection.
The solution is to set the source addresses on the association prior to
adding peers.
Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/associola.c')
| -rw-r--r-- | net/sctp/associola.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/sctp/associola.c b/net/sctp/associola.c index 8450960df24f..7eed77a39d0d 100644 --- a/net/sctp/associola.c +++ b/net/sctp/associola.c @@ -1485,15 +1485,13 @@ void sctp_assoc_rwnd_decrease(struct sctp_association *asoc, unsigned len) * local endpoint and the remote peer. */ int sctp_assoc_set_bind_addr_from_ep(struct sctp_association *asoc, - gfp_t gfp) + sctp_scope_t scope, gfp_t gfp) { - sctp_scope_t scope; int flags; /* Use scoping rules to determine the subset of addresses from * the endpoint. */ - scope = sctp_scope(&asoc->peer.active_path->ipaddr); flags = (PF_INET6 == asoc->base.sk->sk_family) ? SCTP_ADDR6_ALLOWED : 0; if (asoc->peer.ipv4_address) flags |= SCTP_ADDR4_PEERSUPP; |