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

Commit baf9e782 authored by Gerrit Renker's avatar Gerrit Renker
Browse files

dccp: remove unused argument in CCID tx function 



This removes the argument `more' from ccid_hc_tx_packet_sent, since it was
nowhere used in the entire code.

(Btw, this argument was not even used in the original KAME code where the
 function initially came from; compare the variable moreToSend in the
 freebsd61-dccp-kame-28.08.2006.patch kept by Emmanuel Lochin.)

Signed-off-by: default avatarGerrit Renker <gerrit@erg.abdn.ac.uk>
parent 93344af4

net/dccp/ccid.h

+3 −3
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ struct ccid_operations { 
	int		(*ccid_hc_tx_send_packet)(struct sock *sk,

						  struct sk_buff *skb);

	void		(*ccid_hc_tx_packet_sent)(struct sock *sk,

						  int more, unsigned int len);

						  unsigned int len);

	void		(*ccid_hc_rx_get_info)(struct sock *sk,

					       struct tcp_info *info);

	void		(*ccid_hc_tx_get_info)(struct sock *sk,
@@ -144,10 +144,10 @@ static inline int ccid_hc_tx_send_packet(struct ccid *ccid, struct sock *sk, 
}



static inline void ccid_hc_tx_packet_sent(struct ccid *ccid, struct sock *sk,

					  int more, unsigned int len)

					  unsigned int len)

{

	if (ccid->ccid_ops->ccid_hc_tx_packet_sent != NULL)

		ccid->ccid_ops->ccid_hc_tx_packet_sent(sk, more, len);

		ccid->ccid_ops->ccid_hc_tx_packet_sent(sk, len);

}



static inline void ccid_hc_rx_packet_recv(struct ccid *ccid, struct sock *sk,

net/dccp/ccids/ccid2.c

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ static void ccid2_hc_tx_rto_expire(unsigned long data) 
	sock_put(sk);

}



static void ccid2_hc_tx_packet_sent(struct sock *sk, int more, unsigned int len)

static void ccid2_hc_tx_packet_sent(struct sock *sk, unsigned int len)

{

	struct dccp_sock *dp = dccp_sk(sk);

	struct ccid2_hc_tx_sock *hc = ccid2_hc_tx_sk(sk);

net/dccp/ccids/ccid3.c

+1 −2
Original line number Diff line number Diff line
@@ -351,8 +351,7 @@ static int ccid3_hc_tx_send_packet(struct sock *sk, struct sk_buff *skb) 
	return 0;

}



static void ccid3_hc_tx_packet_sent(struct sock *sk, int more,

				    unsigned int len)

static void ccid3_hc_tx_packet_sent(struct sock *sk, unsigned int len)

{

	struct ccid3_hc_tx_sock *hc = ccid3_hc_tx_sk(sk);

net/dccp/output.c

+1 −1
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ void dccp_write_xmit(struct sock *sk, int block) 
				dcb->dccpd_type = DCCP_PKT_DATA;



			err = dccp_transmit_skb(sk, skb);

			ccid_hc_tx_packet_sent(dp->dccps_hc_tx_ccid, sk, 0, len);

			ccid_hc_tx_packet_sent(dp->dccps_hc_tx_ccid, sk, len);

			if (err)

				DCCP_BUG("err=%d after ccid_hc_tx_packet_sent",

					 err);