From: Gerrit Renker <gerrit@erg.abdn.ac.uk>
To: dccp@vger.kernel.org
Subject: [PATCH 1/6]: Remove unused fields in packet history structure
Date: Mon, 11 Jun 2007 12:41:35 +0000 [thread overview]
Message-ID: <200706111341.36030@strip-the-willow> (raw)
[CCID 3]: Remove unused fields in packet history structure
This removes two fields of the TX packet history structure which
are not referenced by the CCID 3 code and are not needed:
* dccphtx_sent - is redundant since the fact that an entry is
present in the TX history in itself is an indication that the
packet has been sent (cf. dccp_write_xmit and ccid3_hc_tx_packet_sent);
* dccphtx_rtt - is nowhere referenced and is not even required:
the `Preventing Oscillations' mechanism in [RFC 3448, 4.5] uses a
moving-average, but does not require to memorize past RTTs;
the history field has no further use;
As a further benefit, the history entry size is reduced.
NB : Adding the newly created entry is now at the end of packet_sent() for the
following reason: if it is in the history /before/ being fully filled in,
list corruption is possible.
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
---
net/dccp/ccids/ccid3.c | 4 +---
net/dccp/ccids/lib/packet_history.h | 12 ++----------
2 files changed, 3 insertions(+), 13 deletions(-)
--- a/net/dccp/ccids/lib/packet_history.h
+++ b/net/dccp/ccids/lib/packet_history.h
@@ -54,9 +54,7 @@
*/
struct dccp_tx_hist_entry {
struct list_head dccphtx_node;
- u64 dccphtx_seqno:48,
- dccphtx_sent:1;
- u32 dccphtx_rtt;
+ u64 dccphtx_seqno;
struct timeval dccphtx_tstamp;
};
@@ -71,13 +69,7 @@ static inline struct dccp_tx_hist_entry
dccp_tx_hist_entry_new(struct dccp_tx_hist *hist,
const gfp_t prio)
{
- struct dccp_tx_hist_entry *entry = kmem_cache_alloc(hist->dccptxh_slab,
- prio);
-
- if (entry != NULL)
- entry->dccphtx_sent = 0;
-
- return entry;
+ return kmem_cache_alloc(hist->dccptxh_slab, prio);
}
static inline struct dccp_tx_hist_entry *
--- a/net/dccp/ccids/ccid3.c
+++ b/net/dccp/ccids/ccid3.c
@@ -406,13 +406,11 @@ static void ccid3_hc_tx_packet_sent(stru
DCCP_CRIT("packet history - out of memory!");
return;
}
- dccp_tx_hist_add_entry(&hctx->ccid3hctx_hist, packet);
dccp_timestamp(sk, &now);
packet->dccphtx_tstamp = now;
packet->dccphtx_seqno = dccp_sk(sk)->dccps_gss;
- packet->dccphtx_rtt = hctx->ccid3hctx_rtt;
- packet->dccphtx_sent = 1;
+ dccp_tx_hist_add_entry(&hctx->ccid3hctx_hist, packet);
}
static void ccid3_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
next reply other threads:[~2007-06-11 12:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-11 12:41 Gerrit Renker [this message]
2007-06-13 2:26 ` [PATCH 1/6]: Remove unused fields in packet history structure Ian McDonald
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=200706111341.36030@strip-the-willow \
--to=gerrit@erg.abdn.ac.uk \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.