Skip to content

Commit

Permalink
tcp: no need to pass prev skb around, reduces arg pressure
Browse files Browse the repository at this point in the history
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Ilpo Järvinen authored and David S. Miller committed Dec 6, 2008
1 parent a1197f5 commit 5013316
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions net/ipv4/tcp_input.c
Original file line number Diff line number Diff line change
Expand Up @@ -1376,12 +1376,12 @@ static u8 tcp_sacktag_one(struct sk_buff *skb, struct sock *sk,
return sacked;
}

static int tcp_shifted_skb(struct sock *sk, struct sk_buff *prev,
struct sk_buff *skb,
static int tcp_shifted_skb(struct sock *sk, struct sk_buff *skb,
struct tcp_sacktag_state *state,
unsigned int pcount, int shifted, int mss)
{
struct tcp_sock *tp = tcp_sk(sk);
struct sk_buff *prev = tcp_write_queue_prev(sk, skb);

BUG_ON(!pcount);

Expand Down Expand Up @@ -1565,7 +1565,7 @@ static struct sk_buff *tcp_shift_skb_data(struct sock *sk, struct sk_buff *skb,

if (!skb_shift(prev, skb, len))
goto fallback;
if (!tcp_shifted_skb(sk, prev, skb, state, pcount, len, mss))
if (!tcp_shifted_skb(sk, skb, state, pcount, len, mss))
goto out;

/* Hole filled allows collapsing with the next as well, this is very
Expand All @@ -1584,8 +1584,7 @@ static struct sk_buff *tcp_shift_skb_data(struct sock *sk, struct sk_buff *skb,
len = skb->len;
if (skb_shift(prev, skb, len)) {
pcount += tcp_skb_pcount(skb);
tcp_shifted_skb(sk, prev, skb, state, tcp_skb_pcount(skb), len,
mss);
tcp_shifted_skb(sk, skb, state, tcp_skb_pcount(skb), len, mss);
}

out:
Expand Down

0 comments on commit 5013316

Please sign in to comment.