Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only.

Commit af138470 authored Apr 26, 2011 by Vlad Yasevich Committed by David S. Miller Apr 27, 2011

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>

parent 9c6a02f4

include/net/sctp/structs.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -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 *);

net/sctp/ipv6.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -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;

net/sctp/protocol.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -562,7 +562,6 @@ out:
		*/
		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;

net/sctp/transport.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;