diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-08-30 22:11:31 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-08-30 22:11:31 -0700 |
| commit | b91ddd843751947e2f81dfc8a86c5c21cbe07158 (patch) | |
| tree | abeab3c0fa11e4295c889951bae407317b7e7eda /net/sctp/socket.c | |
| parent | 05bb1fad1cde025a864a90cfeb98dcbefe78a44a (diff) | |
| parent | cb243a1a9fef4aaff262a5dd14f987070d37229b (diff) | |
| download | talos-op-linux-b91ddd843751947e2f81dfc8a86c5c21cbe07158.tar.gz talos-op-linux-b91ddd843751947e2f81dfc8a86c5c21cbe07158.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/vxy/lksctp-dev
Diffstat (limited to 'net/sctp/socket.c')
| -rw-r--r-- | net/sctp/socket.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 01c6364245b7..33354602ae86 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -353,6 +353,7 @@ SCTP_STATIC int sctp_do_bind(struct sock *sk, union sctp_addr *addr, int len) * The function sctp_get_port_local() does duplicate address * detection. */ + addr->v4.sin_port = htons(snum); if ((ret = sctp_get_port_local(sk, addr))) { if (ret == (long) sk) { /* This endpoint has a conflicting address. */ @@ -5202,6 +5203,7 @@ SCTP_STATIC int sctp_seqpacket_listen(struct sock *sk, int backlog) sctp_unhash_endpoint(ep); sk->sk_state = SCTP_SS_CLOSED; + return 0; } /* Return if we are already listening. */ @@ -5249,6 +5251,7 @@ SCTP_STATIC int sctp_stream_listen(struct sock *sk, int backlog) sctp_unhash_endpoint(ep); sk->sk_state = SCTP_SS_CLOSED; + return 0; } if (sctp_sstate(sk, LISTENING)) |
