Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e312d100 authored by Gerrit Renker's avatar Gerrit Renker Committed by David S. Miller
Browse files

[DCCP] ccid3: TX history - remove unused field 



This removes the `dccphtx_ccval' field since it is nowhere used in the code and
in fact not necessary for the accounting.

Signed-off-by: default avatarGerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: default avatarIan McDonald <ian.mcdonald@jandi.co.nz>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@mandriva.com>
parent 9f8681db

net/dccp/ccids/ccid3.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -370,8 +370,9 @@ static int ccid3_hc_tx_send_packet(struct sock *sk, struct sk_buff *skb) 




	/* prepare to send now (add options etc.) */

	/* prepare to send now (add options etc.) */

	dp->dccps_hc_tx_insert_options = 1;

	dp->dccps_hc_tx_insert_options = 1;

	new_packet->dccphtx_ccval = DCCP_SKB_CB(skb)->dccpd_ccval =

	DCCP_SKB_CB(skb)->dccpd_ccval = hctx->ccid3hctx_last_win_count;

				    hctx->ccid3hctx_last_win_count;



	/* set the nominal send time for the next following packet */

	timeval_add_usecs(&hctx->ccid3hctx_t_nom, hctx->ccid3hctx_t_ipi);

	timeval_add_usecs(&hctx->ccid3hctx_t_nom, hctx->ccid3hctx_t_ipi);





	return 0;

	return 0;

net/dccp/ccids/lib/packet_history.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -52,7 +52,6 @@ 
struct dccp_tx_hist_entry {

struct dccp_tx_hist_entry {

	struct list_head dccphtx_node;

	struct list_head dccphtx_node;

	u64		 dccphtx_seqno:48,

	u64		 dccphtx_seqno:48,

			 dccphtx_ccval:4,

			 dccphtx_sent:1;

			 dccphtx_sent:1;

	u32		 dccphtx_rtt;

	u32		 dccphtx_rtt;

	struct timeval	 dccphtx_tstamp;

	struct timeval	 dccphtx_tstamp;