dccp_li_hist_interval_new doesn't need the last two parameters as the logic
doesn't belong there and makes dccp_li_update_li more confusing as to where
the structure values come from.
And of course it never hurts to reduce stack usage.
Signed-off-by: Ian McDonald <ian.mcdonald@xxxxxxxxxxx>
Signed-off-by: Gerrit Renker <gerrit@xxxxxxxxxxxxxx>
---
diff --git a/net/dccp/ccids/lib/loss_interval.c b/net/dccp/ccids/lib/loss_interval.c
index 35cae17..7908a73 100644
--- a/net/dccp/ccids/lib/loss_interval.c
+++ b/net/dccp/ccids/lib/loss_interval.c
@@ -125,8 +125,7 @@ u32 dccp_li_hist_calc_i_mean(struct list_head *list)
EXPORT_SYMBOL_GPL(dccp_li_hist_calc_i_mean);
-static int dccp_li_hist_interval_new(struct list_head *list,
- const u64 seq_nonloss, const u8 win_nonloss)
+static int dccp_li_hist_interval_new(struct list_head *list)
{
struct dccp_li_hist_entry *entry;
int i;
@@ -142,8 +141,6 @@ static int dccp_li_hist_interval_new(struct list_head *list,
list_add(&entry->dccplih_node, list);
}
- entry->dccplih_seqno = seq_nonloss;
- entry->dccplih_win_count = win_nonloss;
return 1;
}
@@ -257,13 +254,14 @@ void dccp_li_update_li(struct sock *sk)
u8 win_nonloss = hcrx->ccid3hcrx_ccval_nonloss;
if (list_empty(&hcrx->ccid3hcrx_li_hist)) {
- if (!dccp_li_hist_interval_new(&hcrx->ccid3hcrx_li_hist,
- seq_nonloss, win_nonloss))
+ if (!dccp_li_hist_interval_new(&hcrx->ccid3hcrx_li_hist))
return;
head = list_entry(hcrx->ccid3hcrx_li_hist.next,
struct dccp_li_hist_entry, dccplih_node);
head->dccplih_interval = dccp_li_calc_first_li(sk);
+ head->dccplih_seqno = seq_nonloss;
+ head->dccplih_win_count = win_nonloss;
} else {
struct dccp_li_hist_entry *entry;
struct list_head *tail;
-
To unsubscribe from this list: send the line "unsubscribe dccp" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
