diff options
| author | Michio Honda <micchie@sfc.wide.ad.jp> | 2011-06-16 10:14:34 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-08-25 04:41:13 +0200 |
| commit | 6af29ccc223b0feb6fc6112281c3fa3cdb1afddf (patch) | |
| tree | 53cc047bce9d4c81860f5e852851f94cd1022e0e /net/sctp/sm_statefuns.c | |
| parent | sctp: HEARTBEAT negotiation after ASCONF (diff) | |
| download | linux-6af29ccc223b0feb6fc6112281c3fa3cdb1afddf.tar.xz linux-6af29ccc223b0feb6fc6112281c3fa3cdb1afddf.zip | |
sctp: Bundle HEAERTBEAT into ASCONF_ACK
With this patch a HEARTBEAT chunk is bundled into the ASCONF-ACK
for ADD IP ADDRESS, confirming the new destination as quickly as
possible.
Signed-off-by: Michio Honda <micchie@sfc.wide.ad.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/sm_statefuns.c')
| -rw-r--r-- | net/sctp/sm_statefuns.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c index 49b847b00f99..73d14fc02606 100644 --- a/net/sctp/sm_statefuns.c +++ b/net/sctp/sm_statefuns.c @@ -3612,6 +3612,11 @@ sctp_disposition_t sctp_sf_do_asconf(const struct sctp_endpoint *ep, */ asconf_ack->dest = chunk->source; sctp_add_cmd_sf(commands, SCTP_CMD_REPLY, SCTP_CHUNK(asconf_ack)); + if (asoc->new_transport) { + sctp_sf_heartbeat(ep, asoc, type, asoc->new_transport, + commands); + ((struct sctp_association *)asoc)->new_transport = NULL; + } return SCTP_DISPOSITION_CONSUME; } |