summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-05-06 16:32:47 -0700
committerDavid S. Miller <davem@davemloft.net>2011-05-08 14:05:14 -0700
commit8663c938ceb72f47941c95ff0ea491ebbdd68f26 (patch)
treef87bf63fb7f8ca29e01083e742c0530c25a9feb9
parentb57ae01a8a8446dbbed7365c9b05aef1fc6dea20 (diff)
downloadlinux-8663c938ceb72f47941c95ff0ea491ebbdd68f26.tar.bz2
sctp: Store a flowi in transports to provide persistent keying.
Several future simplifications are possible now because of this. For example, the sctp_addr unions can simply refer directly to the flowi information. Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/sctp/structs.h1
-rw-r--r--net/sctp/transport.c9
2 files changed, 4 insertions, 6 deletions
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index ff3e8cce7d66..795f4886e111 100644
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -894,6 +894,7 @@ struct sctp_transport {
/* Is this structure kfree()able? */
malloced:1;
+ struct flowi fl;
/* This is the peer's IP address and port. */
union sctp_addr ipaddr;
diff --git a/net/sctp/transport.c b/net/sctp/transport.c
index d8595dd1a8a7..394c57ca2f54 100644
--- a/net/sctp/transport.c
+++ b/net/sctp/transport.c
@@ -213,13 +213,11 @@ void sctp_transport_set_owner(struct sctp_transport *transport,
/* Initialize the pmtu of a transport. */
void sctp_transport_pmtu(struct sctp_transport *transport, struct sock *sk)
{
- struct flowi fl;
-
/* If we don't have a fresh route, look one up */
if (!transport->dst || transport->dst->obsolete > 1) {
dst_release(transport->dst);
transport->af_specific->get_dst(transport, &transport->saddr,
- &fl, sk);
+ &transport->fl, sk);
}
if (transport->dst) {
@@ -274,14 +272,13 @@ void sctp_transport_route(struct sctp_transport *transport,
{
struct sctp_association *asoc = transport->asoc;
struct sctp_af *af = transport->af_specific;
- struct flowi fl;
- af->get_dst(transport, saddr, &fl, sctp_opt2sk(opt));
+ af->get_dst(transport, saddr, &transport->fl, sctp_opt2sk(opt));
if (saddr)
memcpy(&transport->saddr, saddr, sizeof(union sctp_addr));
else
- af->get_saddr(opt, transport, &fl);
+ af->get_saddr(opt, transport, &transport->fl);
if ((transport->param_flags & SPP_PMTUD_DISABLE) && transport->pathmtu) {
return;