diff options
author | Vlad Yasevich <vladislav.yasevich@hp.com> | 2011-04-26 17:53:20 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-04-27 16:14:06 -0400 |
commit | af1384703f8a4ff3d245925d6596ef1c5c6e469e (patch) | |
tree | e96ff72cb9dd65961d0e175a61aa6c0b8c91b7e1 | |
parent | 9c6a02f41d10dc9fbf5dd42058e8846f38dd2d9a (diff) |
sctp: remove useless arguments from get_saddr() call
There is no point in passing a destination address to
a get_saddr() call.
Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | include/net/sctp/structs.h | 1 | ||||
-rw-r--r-- | net/sctp/ipv6.c | 5 | ||||
-rw-r--r-- | net/sctp/protocol.c | 1 | ||||
-rw-r--r-- | net/sctp/transport.c | 2 |
4 files changed, 2 insertions, 7 deletions
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h index 1d465d62f34f..bb2f43b7e9a8 100644 --- a/include/net/sctp/structs.h +++ b/include/net/sctp/structs.h | |||
@@ -571,7 +571,6 @@ struct sctp_af { | |||
571 | struct sock *sk); | 571 | struct sock *sk); |
572 | void (*get_saddr) (struct sctp_sock *sk, | 572 | void (*get_saddr) (struct sctp_sock *sk, |
573 | struct sctp_transport *t, | 573 | struct sctp_transport *t, |
574 | union sctp_addr *daddr, | ||
575 | struct flowi *fl); | 574 | struct flowi *fl); |
576 | void (*copy_addrlist) (struct list_head *, | 575 | void (*copy_addrlist) (struct list_head *, |
577 | struct net_device *); | 576 | struct net_device *); |
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c index 593c80162913..a1913a4b6f3a 100644 --- a/net/sctp/ipv6.c +++ b/net/sctp/ipv6.c | |||
@@ -365,15 +365,12 @@ static inline int sctp_v6_addr_match_len(union sctp_addr *s1, | |||
365 | */ | 365 | */ |
366 | static void sctp_v6_get_saddr(struct sctp_sock *sk, | 366 | static void sctp_v6_get_saddr(struct sctp_sock *sk, |
367 | struct sctp_transport *t, | 367 | struct sctp_transport *t, |
368 | union sctp_addr *daddr, | ||
369 | struct flowi *fl) | 368 | struct flowi *fl) |
370 | { | 369 | { |
371 | struct flowi6 *fl6 = &fl->u.ip6; | 370 | struct flowi6 *fl6 = &fl->u.ip6; |
372 | union sctp_addr *saddr = &t->saddr; | 371 | union sctp_addr *saddr = &t->saddr; |
373 | 372 | ||
374 | SCTP_DEBUG_PRINTK("%s: asoc:%p dst:%p daddr:%pI6 ", | 373 | SCTP_DEBUG_PRINTK("%s: asoc:%p dst:%p\n", __func__, t->asoc, t->dst); |
375 | __func__, t->asoc, t->dst, &daddr->v6.sin6_addr); | ||
376 | |||
377 | 374 | ||
378 | if (t->dst) { | 375 | if (t->dst) { |
379 | saddr->v6.sin6_family = AF_INET6; | 376 | saddr->v6.sin6_family = AF_INET6; |
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c index 34216458ded1..68b4c4317d61 100644 --- a/net/sctp/protocol.c +++ b/net/sctp/protocol.c | |||
@@ -562,7 +562,6 @@ out: | |||
562 | */ | 562 | */ |
563 | static void sctp_v4_get_saddr(struct sctp_sock *sk, | 563 | static void sctp_v4_get_saddr(struct sctp_sock *sk, |
564 | struct sctp_transport *t, | 564 | struct sctp_transport *t, |
565 | union sctp_addr *daddr, | ||
566 | struct flowi *fl) | 565 | struct flowi *fl) |
567 | { | 566 | { |
568 | union sctp_addr *saddr = &t->saddr; | 567 | union sctp_addr *saddr = &t->saddr; |
diff --git a/net/sctp/transport.c b/net/sctp/transport.c index 2544b9b21f86..1fbb920f8dfb 100644 --- a/net/sctp/transport.c +++ b/net/sctp/transport.c | |||
@@ -284,7 +284,7 @@ void sctp_transport_route(struct sctp_transport *transport, | |||
284 | if (saddr) | 284 | if (saddr) |
285 | memcpy(&transport->saddr, saddr, sizeof(union sctp_addr)); | 285 | memcpy(&transport->saddr, saddr, sizeof(union sctp_addr)); |
286 | else | 286 | else |
287 | af->get_saddr(opt, transport, daddr, &fl); | 287 | af->get_saddr(opt, transport, &fl); |
288 | 288 | ||
289 | if ((transport->param_flags & SPP_PMTUD_DISABLE) && transport->pathmtu) { | 289 | if ((transport->param_flags & SPP_PMTUD_DISABLE) && transport->pathmtu) { |
290 | return; | 290 | return; |