redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

dccp: combine the functionality of enqeueing and cloning

Browse source 
Realising the following call pattern,
 * first dccp_entail() is called to enqueue a new skb and
 * then skb_clone() is called to transmit a clone of that skb,
this patch integrates both into the same function.

Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
This commit is contained in:
Gerrit Renker 2011-07-03 09:51:29 -06:00
parent c0c2015056
commit 8695e80193
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
net/dccp/output.c
View file

@ -27,11 +27,13 @@ static inline void dccp_event_ack_sent(struct sock *sk)
inet_csk_clear_xmit_timer(sk, ICSK_TIME_DACK); inet_csk_clear_xmit_timer(sk, ICSK_TIME_DACK);
} }
static void dccp_skb_entail(struct sock *sk, struct sk_buff *skb) /* enqueue @skb on sk_send_head for retransmission, return clone to send now */
static struct sk_buff *dccp_skb_entail(struct sock *sk, struct sk_buff *skb)
{ {
skb_set_owner_w(skb, sk); skb_set_owner_w(skb, sk);
WARN_ON(sk->sk_send_head); WARN_ON(sk->sk_send_head);
sk->sk_send_head = skb; sk->sk_send_head = skb;
return skb_clone(sk->sk_send_head, gfp_any());
} }
/* /*
@ -552,8 +554,7 @@ int dccp_connect(struct sock *sk)
DCCP_SKB_CB(skb)->dccpd_type = DCCP_PKT_REQUEST; DCCP_SKB_CB(skb)->dccpd_type = DCCP_PKT_REQUEST;
dccp_skb_entail(sk, skb); dccp_transmit_skb(sk, dccp_skb_entail(sk, skb));
dccp_transmit_skb(sk, skb_clone(skb, GFP_KERNEL));
DCCP_INC_STATS(DCCP_MIB_ACTIVEOPENS); DCCP_INC_STATS(DCCP_MIB_ACTIVEOPENS);
/* Timer for repeating the REQUEST until an answer. */ /* Timer for repeating the REQUEST until an answer. */
@ -678,8 +679,7 @@ void dccp_send_close(struct sock *sk, const int active)
DCCP_SKB_CB(skb)->dccpd_type = DCCP_PKT_CLOSE; DCCP_SKB_CB(skb)->dccpd_type = DCCP_PKT_CLOSE;
if (active) { if (active) {
dccp_skb_entail(sk, skb); skb = dccp_skb_entail(sk, skb);
dccp_transmit_skb(sk, skb_clone(skb, prio));
/* /*
* Retransmission timer for active-close: RFC 4340, 8.3 requires * Retransmission timer for active-close: RFC 4340, 8.3 requires
* to retransmit the Close/CloseReq until the CLOSING/CLOSEREQ * to retransmit the Close/CloseReq until the CLOSING/CLOSEREQ
@ -692,6 +692,6 @@ void dccp_send_close(struct sock *sk, const int active)
*/ */
inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS, inet_csk_reset_xmit_timer(sk, ICSK_TIME_RETRANS,
DCCP_TIMEOUT_INIT, DCCP_RTO_MAX); DCCP_TIMEOUT_INIT, DCCP_RTO_MAX);
} else }
dccp_transmit_skb(sk, skb); dccp_transmit_skb(sk, skb);
} }