diff options
author | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2006-11-27 09:28:48 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-03 00:30:41 -0500 |
commit | 5e19e3fcd7351de1ca87c4797cca27ba55c7e55e (patch) | |
tree | 4d96f6c0c8fd8dc15a90c0172d433e4cb67ca3c3 /net/dccp | |
parent | 70dbd5b0ef3915f1e018e6437c8db9e999b0d701 (diff) |
[DCCP] ccid3: Resolve small FIXME
This considers the case - ACK received while no packet has been sent
so far. Resolved by printing a (rate-limited) warning message.
Further removes an unnecessary BUG_ON in ccid3_hc_tx_packet_recv,
received feedback on a terminating connection is simply ignored.
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: Ian McDonald <ian.mcdonald@jandi.co.nz>
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Diffstat (limited to 'net/dccp')
-rw-r--r-- | net/dccp/ccids/ccid3.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c index 58f7cac6aa3d..6777a7f33a9a 100644 --- a/net/dccp/ccids/ccid3.c +++ b/net/dccp/ccids/ccid3.c | |||
@@ -413,9 +413,6 @@ static void ccid3_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb) | |||
413 | pinv = opt_recv->ccid3or_loss_event_rate; | 413 | pinv = opt_recv->ccid3or_loss_event_rate; |
414 | 414 | ||
415 | switch (hctx->ccid3hctx_state) { | 415 | switch (hctx->ccid3hctx_state) { |
416 | case TFRC_SSTATE_NO_SENT: | ||
417 | /* FIXME: what to do here? */ | ||
418 | return; | ||
419 | case TFRC_SSTATE_NO_FBACK: | 416 | case TFRC_SSTATE_NO_FBACK: |
420 | case TFRC_SSTATE_FBACK: | 417 | case TFRC_SSTATE_FBACK: |
421 | /* Calculate new round trip sample by | 418 | /* Calculate new round trip sample by |
@@ -521,8 +518,10 @@ static void ccid3_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb) | |||
521 | /* set idle flag */ | 518 | /* set idle flag */ |
522 | hctx->ccid3hctx_idle = 1; | 519 | hctx->ccid3hctx_idle = 1; |
523 | break; | 520 | break; |
524 | case TFRC_SSTATE_TERM: | 521 | case TFRC_SSTATE_NO_SENT: |
525 | DCCP_BUG("Illegal %s state TERM, sk=%p", dccp_role(sk), sk); | 522 | DCCP_WARN("Illegal ACK received - no packet has been sent\n"); |
523 | /* fall through */ | ||
524 | case TFRC_SSTATE_TERM: /* ignore feedback when closing */ | ||
526 | break; | 525 | break; |
527 | } | 526 | } |
528 | } | 527 | } |