From: Leandro <leandroal@gmail.com>
To: dccp@vger.kernel.org
Subject: [PATCH 9/25] Adapt CCID-4 according to the latest changes to CCID-3
Date: Thu, 01 Nov 2007 00:30:35 +0000 [thread overview]
Message-ID: <200710312130.35629.leandroal@gmail.com> (raw)
[CCID-4] Adapt CCID-4 according to the latest changes to CCID-3
Signed-off-by: Leandro Melo de Sales <leandro@embedded.ufcg.edu.br>
Index: leandro.new/net/dccp/ccids/ccid4.c
=================================--- leandro.new.orig/net/dccp/ccids/ccid4.c
+++ leandro.new/net/dccp/ccids/ccid4.c
@@ -156,7 +156,6 @@ static inline void ccid4_hc_tx_x_header_
*
*/
static void ccid4_hc_tx_update_x(struct sock *sk, ktime_t *stamp)
-
{
struct ccid4_hc_tx_sock *hctx = ccid4_hc_tx_sk(sk);
__u64 min_rate = 2 * hctx->ccid4hctx_x_recv;
@@ -939,7 +938,7 @@ static int ccid4_hc_rx_getsockopt(struct
static struct ccid_operations ccid4 = {
.ccid_id = DCCPC_CCID4,
- .ccid_name = "ccid4",
+ .ccid_name = "TCP-Friendly Rate Control (Small-Packet variant)",
.ccid_owner = THIS_MODULE,
.ccid_hc_tx_obj_size = sizeof(struct ccid4_hc_tx_sock),
.ccid_hc_tx_init = ccid4_hc_tx_init,
Index: leandro.new/net/dccp/ccids/ccid4.h
=================================--- leandro.new.orig/net/dccp/ccids/ccid4.h
+++ leandro.new/net/dccp/ccids/ccid4.h
@@ -128,10 +128,9 @@ struct ccid4_hc_tx_sock {
static inline struct ccid4_hc_tx_sock *ccid4_hc_tx_sk(const struct sock *sk)
{
- void *ccid4_tx_priv = ccid_priv(dccp_sk(sk)->dccps_hc_tx_ccid);
-
- BUG_ON(ccid4_tx_priv = NULL);
- return ccid4_tx_priv;
+ struct ccid4_hc_tx_sock *hctx = ccid_priv(dccp_sk(sk)->dccps_hc_tx_ccid);
+ BUG_ON(hctx = NULL);
+ return hctx;
}
/* CCID4 receiver states */
@@ -177,10 +176,9 @@ struct ccid4_hc_rx_sock {
static inline struct ccid4_hc_rx_sock *ccid4_hc_rx_sk(const struct sock *sk)
{
- void *ccid4_rx_priv = ccid_priv(dccp_sk(sk)->dccps_hc_rx_ccid);
-
- BUG_ON(ccid4_rx_priv = NULL);
- return ccid4_rx_priv;
+ struct ccid4_hc_rx_sock *hcrx = ccid_priv(dccp_sk(sk)->dccps_hc_rx_ccid);
+ BUG_ON(hcrx = NULL);
+ return hcrx;
}
#endif /* _DCCP_CCID4_H_ */
next reply other threads:[~2007-11-01 0:30 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-01 0:30 Leandro [this message]
2007-11-01 12:32 ` [PATCH 9/25] Adapt CCID-4 according to the latest changes to Tommi Saviranta
2007-11-01 21:44 ` [PATCH 9/25] Adapt CCID-4 according to the latest changes to CCID-3 Łeandro Sales
2007-11-01 22:14 ` [PATCH 9/25] Adapt CCID-4 according to the latest changes to Tommi Saviranta
2007-11-08 11:27 ` [PATCH 9/25] Adapt CCID-4 according to the latest changes to CCID-3 Gerrit Renker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200710312130.35629.leandroal@gmail.com \
--to=leandroal@gmail.com \
--cc=dccp@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox