diff options
author | Eric Dumazet <edumazet@google.com> | 2014-03-26 12:57:19 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-03-27 15:10:10 -0400 |
commit | a0b8486caf4739c09eba651da49efba07c8b6433 (patch) | |
tree | eb72ca7c96dc2bb27eb709f3fa1c13124bd6bdfb | |
parent | e5fd387ad5b30ca3971fbccb0735c843cdebf967 (diff) |
tcp: tcp_make_synack() minor changes
There is no need to allocate 15 bytes in excess for a SYNACK packet,
as it contains no data, only headers.
SYNACK are always generated in softirq context, and contain a single
segment, we can use TCP_INC_STATS_BH()
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/ipv4/tcp_output.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 21533f5e4a61..699fb102e971 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
@@ -2741,7 +2741,7 @@ struct sk_buff *tcp_make_synack(struct sock *sk, struct dst_entry *dst, | |||
2741 | int tcp_header_size; | 2741 | int tcp_header_size; |
2742 | int mss; | 2742 | int mss; |
2743 | 2743 | ||
2744 | skb = sock_wmalloc(sk, MAX_TCP_HEADER + 15, 1, GFP_ATOMIC); | 2744 | skb = sock_wmalloc(sk, MAX_TCP_HEADER, 1, GFP_ATOMIC); |
2745 | if (unlikely(!skb)) { | 2745 | if (unlikely(!skb)) { |
2746 | dst_release(dst); | 2746 | dst_release(dst); |
2747 | return NULL; | 2747 | return NULL; |
@@ -2811,7 +2811,7 @@ struct sk_buff *tcp_make_synack(struct sock *sk, struct dst_entry *dst, | |||
2811 | th->window = htons(min(req->rcv_wnd, 65535U)); | 2811 | th->window = htons(min(req->rcv_wnd, 65535U)); |
2812 | tcp_options_write((__be32 *)(th + 1), tp, &opts); | 2812 | tcp_options_write((__be32 *)(th + 1), tp, &opts); |
2813 | th->doff = (tcp_header_size >> 2); | 2813 | th->doff = (tcp_header_size >> 2); |
2814 | TCP_ADD_STATS(sock_net(sk), TCP_MIB_OUTSEGS, tcp_skb_pcount(skb)); | 2814 | TCP_INC_STATS_BH(sock_net(sk), TCP_MIB_OUTSEGS); |
2815 | 2815 | ||
2816 | #ifdef CONFIG_TCP_MD5SIG | 2816 | #ifdef CONFIG_TCP_MD5SIG |
2817 | /* Okay, we have all we need - do the md5 hash if needed */ | 2817 | /* Okay, we have all we need - do the md5 hash if needed */ |