Skip to content

Commit

Permalink
sctp: remove useless arguments from get_saddr() call
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Vlad Yasevich authored and David S. Miller committed Apr 27, 2011
1 parent 9c6a02f commit af13847
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 7 deletions.
1 change: 0 additions & 1 deletion include/net/sctp/structs.h
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,6 @@ struct sctp_af {
struct sock *sk);
void (*get_saddr) (struct sctp_sock *sk,
struct sctp_transport *t,
union sctp_addr *daddr,
struct flowi *fl);
void (*copy_addrlist) (struct list_head *,
struct net_device *);
Expand Down
5 changes: 1 addition & 4 deletions net/sctp/ipv6.c
Original file line number Diff line number Diff line change
Expand Up @@ -365,15 +365,12 @@ static inline int sctp_v6_addr_match_len(union sctp_addr *s1,
*/
static void sctp_v6_get_saddr(struct sctp_sock *sk,
struct sctp_transport *t,
union sctp_addr *daddr,
struct flowi *fl)
{
struct flowi6 *fl6 = &fl->u.ip6;
union sctp_addr *saddr = &t->saddr;

SCTP_DEBUG_PRINTK("%s: asoc:%p dst:%p daddr:%pI6 ",
__func__, t->asoc, t->dst, &daddr->v6.sin6_addr);

SCTP_DEBUG_PRINTK("%s: asoc:%p dst:%p\n", __func__, t->asoc, t->dst);

if (t->dst) {
saddr->v6.sin6_family = AF_INET6;
Expand Down
1 change: 0 additions & 1 deletion net/sctp/protocol.c
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,6 @@ static struct dst_entry *sctp_v4_get_dst(struct sctp_association *asoc,
*/
static void sctp_v4_get_saddr(struct sctp_sock *sk,
struct sctp_transport *t,
union sctp_addr *daddr,
struct flowi *fl)
{
union sctp_addr *saddr = &t->saddr;
Expand Down
2 changes: 1 addition & 1 deletion net/sctp/transport.c
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ void sctp_transport_route(struct sctp_transport *transport,
if (saddr)
memcpy(&transport->saddr, saddr, sizeof(union sctp_addr));
else
af->get_saddr(opt, transport, daddr, &fl);
af->get_saddr(opt, transport, &fl);

if ((transport->param_flags & SPP_PMTUD_DISABLE) && transport->pathmtu) {
return;
Expand Down

0 comments on commit af13847

Please sign in to comment.