aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-11-20 20:24:21 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-03 00:27:06 -0500
commit7dcdbd9579c944bb833f95a7f276d01f49161734 (patch)
tree4cfbd59e73cec266fd0589da183f02d37fb53b8b
parent516b20ee2d4df76e7f76332e161a25c70e8f7bea (diff)
[SCTP]: Don't bother setting sin_port in ->from_sk().
... the only caller will overwrite immediately Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/sctp/ipv6.c2
-rw-r--r--net/sctp/protocol.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
index e6bb08767b83..8e2b1e4ec66e 100644
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
@@ -371,7 +371,7 @@ static void sctp_v6_from_skb(union sctp_addr *addr,struct sk_buff *skb,
371static void sctp_v6_from_sk(union sctp_addr *addr, struct sock *sk) 371static void sctp_v6_from_sk(union sctp_addr *addr, struct sock *sk)
372{ 372{
373 addr->v6.sin6_family = AF_INET6; 373 addr->v6.sin6_family = AF_INET6;
374 addr->v6.sin6_port = inet_sk(sk)->num; 374 addr->v6.sin6_port = 0;
375 addr->v6.sin6_addr = inet6_sk(sk)->rcv_saddr; 375 addr->v6.sin6_addr = inet6_sk(sk)->rcv_saddr;
376} 376}
377 377
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
index 807c97da33a5..c6297744a4ed 100644
--- a/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
@@ -272,7 +272,7 @@ static void sctp_v4_from_skb(union sctp_addr *addr, struct sk_buff *skb,
272static void sctp_v4_from_sk(union sctp_addr *addr, struct sock *sk) 272static void sctp_v4_from_sk(union sctp_addr *addr, struct sock *sk)
273{ 273{
274 addr->v4.sin_family = AF_INET; 274 addr->v4.sin_family = AF_INET;
275 addr->v4.sin_port = inet_sk(sk)->num; 275 addr->v4.sin_port = 0;
276 addr->v4.sin_addr.s_addr = inet_sk(sk)->rcv_saddr; 276 addr->v4.sin_addr.s_addr = inet_sk(sk)->rcv_saddr;
277} 277}
278 278