diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-06-23 21:00:22 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-06-29 02:24:31 -0400 |
commit | c4ead4c595cd54cf7b1a184d4f888ce0d7cce7d4 (patch) | |
tree | a78a70904126106d61d9b16c3179c8cafb16df99 /net/ipv4 | |
parent | 9618e2ffd78aaa43a5815e1dd456b4dd95f9e53b (diff) |
tcp: tso_fragment() might avoid GFP_ATOMIC
We can pass a gfp argument to tso_fragment() and avoid GFP_ATOMIC
allocations sometimes.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/tcp_output.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 51d316dbb058..25ff62e35a68 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
@@ -1460,7 +1460,7 @@ int tcp_may_send_now(struct sock *sk) | |||
1460 | * packet has never been sent out before (and thus is not cloned). | 1460 | * packet has never been sent out before (and thus is not cloned). |
1461 | */ | 1461 | */ |
1462 | static int tso_fragment(struct sock *sk, struct sk_buff *skb, unsigned int len, | 1462 | static int tso_fragment(struct sock *sk, struct sk_buff *skb, unsigned int len, |
1463 | unsigned int mss_now) | 1463 | unsigned int mss_now, gfp_t gfp) |
1464 | { | 1464 | { |
1465 | struct sk_buff *buff; | 1465 | struct sk_buff *buff; |
1466 | int nlen = skb->len - len; | 1466 | int nlen = skb->len - len; |
@@ -1470,7 +1470,7 @@ static int tso_fragment(struct sock *sk, struct sk_buff *skb, unsigned int len, | |||
1470 | if (skb->len != skb->data_len) | 1470 | if (skb->len != skb->data_len) |
1471 | return tcp_fragment(sk, skb, len, mss_now); | 1471 | return tcp_fragment(sk, skb, len, mss_now); |
1472 | 1472 | ||
1473 | buff = sk_stream_alloc_skb(sk, 0, GFP_ATOMIC); | 1473 | buff = sk_stream_alloc_skb(sk, 0, gfp); |
1474 | if (unlikely(buff == NULL)) | 1474 | if (unlikely(buff == NULL)) |
1475 | return -ENOMEM; | 1475 | return -ENOMEM; |
1476 | 1476 | ||
@@ -1768,7 +1768,7 @@ static int tcp_write_xmit(struct sock *sk, unsigned int mss_now, int nonagle, | |||
1768 | cwnd_quota); | 1768 | cwnd_quota); |
1769 | 1769 | ||
1770 | if (skb->len > limit && | 1770 | if (skb->len > limit && |
1771 | unlikely(tso_fragment(sk, skb, limit, mss_now))) | 1771 | unlikely(tso_fragment(sk, skb, limit, mss_now, gfp))) |
1772 | break; | 1772 | break; |
1773 | 1773 | ||
1774 | TCP_SKB_CB(skb)->when = tcp_time_stamp; | 1774 | TCP_SKB_CB(skb)->when = tcp_time_stamp; |