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

Commit 5cc3741d authored by Ian McDonald's avatar Ian McDonald Committed by David S. Miller
Browse files

[DCCP]: Remove timeo from output.c 



It simplifies waiting for the CCID module to signal that a packet
is ready to be sent.  Other simplifications flow on from this such as
removing constants.

As a result of this EAGAIN is not returned any more by dccp_wait_for_ccid
(which would otherwise lead to unnecessarily discarding the packet in
dccp_write_xmit).

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

net/dccp/dccp.h

+0 −2
Original line number Diff line number Diff line
@@ -80,8 +80,6 @@ extern void dccp_time_wait(struct sock *sk, int state, int timeo); 


#define DCCP_RTO_MAX ((unsigned)(120 * HZ)) /* FIXME: using TCP value */



#define DCCP_XMIT_TIMEO 30000 /* Time/msecs for blocking transmit per packet */



/* sysctl variables for DCCP */

extern int  sysctl_dccp_request_retries;

extern int  sysctl_dccp_retries1;

net/dccp/output.c

+6 −20
Original line number Diff line number Diff line
@@ -175,14 +175,12 @@ void dccp_write_space(struct sock *sk) 
/**

 * dccp_wait_for_ccid - Wait for ccid to tell us we can send a packet

 * @sk: socket to wait for

 * @timeo: for how long

 */

static int dccp_wait_for_ccid(struct sock *sk, struct sk_buff *skb,

			      long *timeo)

static int dccp_wait_for_ccid(struct sock *sk, struct sk_buff *skb)

{

	struct dccp_sock *dp = dccp_sk(sk);

	DEFINE_WAIT(wait);

	long delay;

	unsigned long delay;

	int rc;



	while (1) {
@@ -190,8 +188,6 @@ static int dccp_wait_for_ccid(struct sock *sk, struct sk_buff *skb, 


		if (sk->sk_err)

			goto do_error;

		if (!*timeo)

			goto do_nonblock;

		if (signal_pending(current))

			goto do_interrupted;
@@ -199,12 +195,9 @@ static int dccp_wait_for_ccid(struct sock *sk, struct sk_buff *skb, 
		if (rc <= 0)

			break;

		delay = msecs_to_jiffies(rc);

		if (delay > *timeo || delay < 0)

			goto do_nonblock;



		sk->sk_write_pending++;

		release_sock(sk);

		*timeo -= schedule_timeout(delay);

		schedule_timeout(delay);

		lock_sock(sk);

		sk->sk_write_pending--;

	}
@@ -215,11 +208,8 @@ static int dccp_wait_for_ccid(struct sock *sk, struct sk_buff *skb, 
do_error:

	rc = -EPIPE;

	goto out;

do_nonblock:

	rc = -EAGAIN;

	goto out;

do_interrupted:

	rc = sock_intr_errno(*timeo);

	rc = -EINTR;

	goto out;

}
@@ -240,8 +230,6 @@ void dccp_write_xmit(struct sock *sk, int block) 
{

	struct dccp_sock *dp = dccp_sk(sk);

	struct sk_buff *skb;

	long timeo = DCCP_XMIT_TIMEO; 	/* If a packet is taking longer than

					   this we have other issues */



	while ((skb = skb_peek(&sk->sk_write_queue))) {

		int err = ccid_hc_tx_send_packet(dp->dccps_hc_tx_ccid, sk, skb);
@@ -251,10 +239,8 @@ void dccp_write_xmit(struct sock *sk, int block) 
				sk_reset_timer(sk, &dp->dccps_xmit_timer,

						msecs_to_jiffies(err)+jiffies);

				break;

			} else {

				err = dccp_wait_for_ccid(sk, skb, &timeo);

				timeo = DCCP_XMIT_TIMEO;

			}

			} else

				err = dccp_wait_for_ccid(sk, skb);

			if (err)

				DCCP_BUG("err=%d after dccp_wait_for_ccid", err);

		}