diff options
author | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2006-12-03 11:51:14 -0500 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2006-12-03 11:51:14 -0500 |
commit | 26af3072b035daadf34a99d02510f0ff98f41f90 (patch) | |
tree | 2e3bde9b1b8c4bf9f9f74f0b7c2ee0f512664ecf /net/dccp | |
parent | 5c3fbb6acf9d32772ec7fc01cedd9478d0e26f44 (diff) |
[DCCP] ccid3: Fix warning message about illegal ACK
This avoids a (harmless) warning message being printed at the DCCP server
(the receiver of a DCCP half connection).
Incoming packets are both directed to
* ccid_hc_rx_packet_recv() for the server half
* ccid_hc_tx_packet_recv() for the client half
The message gets printed since on a server the client half is currently not
sending data packets.
This is resolved for the moment by checking the DCCP-role first. In future
times (bidirectional DCCP connections), this test may have to be more
sophisticated.
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Acked-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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c index bd353044c547..721efc7ed319 100644 --- a/net/dccp/ccids/ccid3.c +++ b/net/dccp/ccids/ccid3.c | |||
@@ -555,7 +555,8 @@ static void ccid3_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb) | |||
555 | hctx->ccid3hctx_idle = 1; | 555 | hctx->ccid3hctx_idle = 1; |
556 | break; | 556 | break; |
557 | case TFRC_SSTATE_NO_SENT: | 557 | case TFRC_SSTATE_NO_SENT: |
558 | DCCP_WARN("Illegal ACK received - no packet has been sent\n"); | 558 | if (dccp_sk(sk)->dccps_role == DCCP_ROLE_CLIENT) |
559 | DCCP_WARN("Illegal ACK received - no packet sent\n"); | ||
559 | /* fall through */ | 560 | /* fall through */ |
560 | case TFRC_SSTATE_TERM: /* ignore feedback when closing */ | 561 | case TFRC_SSTATE_TERM: /* ignore feedback when closing */ |
561 | break; | 562 | break; |