diff options
Diffstat (limited to 'net/ipv4/tcp.c')
-rw-r--r-- | net/ipv4/tcp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 5bd43d7294fd..ac6516c642a1 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c | |||
@@ -475,7 +475,7 @@ static inline void skb_entail(struct sock *sk, struct tcp_sock *tp, | |||
475 | if (!sk->sk_send_head) | 475 | if (!sk->sk_send_head) |
476 | sk->sk_send_head = skb; | 476 | sk->sk_send_head = skb; |
477 | if (tp->nonagle & TCP_NAGLE_PUSH) | 477 | if (tp->nonagle & TCP_NAGLE_PUSH) |
478 | tp->nonagle &= ~TCP_NAGLE_PUSH; | 478 | tp->nonagle &= ~TCP_NAGLE_PUSH; |
479 | } | 479 | } |
480 | 480 | ||
481 | static inline void tcp_mark_urg(struct tcp_sock *tp, int flags, | 481 | static inline void tcp_mark_urg(struct tcp_sock *tp, int flags, |
@@ -557,7 +557,7 @@ new_segment: | |||
557 | } | 557 | } |
558 | if (!sk_stream_wmem_schedule(sk, copy)) | 558 | if (!sk_stream_wmem_schedule(sk, copy)) |
559 | goto wait_for_memory; | 559 | goto wait_for_memory; |
560 | 560 | ||
561 | if (can_coalesce) { | 561 | if (can_coalesce) { |
562 | skb_shinfo(skb)->frags[i - 1].size += copy; | 562 | skb_shinfo(skb)->frags[i - 1].size += copy; |
563 | } else { | 563 | } else { |
@@ -1439,12 +1439,12 @@ skip_copy: | |||
1439 | dma_async_memcpy_issue_pending(tp->ucopy.dma_chan); | 1439 | dma_async_memcpy_issue_pending(tp->ucopy.dma_chan); |
1440 | 1440 | ||
1441 | while (dma_async_memcpy_complete(tp->ucopy.dma_chan, | 1441 | while (dma_async_memcpy_complete(tp->ucopy.dma_chan, |
1442 | tp->ucopy.dma_cookie, &done, | 1442 | tp->ucopy.dma_cookie, &done, |
1443 | &used) == DMA_IN_PROGRESS) { | 1443 | &used) == DMA_IN_PROGRESS) { |
1444 | /* do partial cleanup of sk_async_wait_queue */ | 1444 | /* do partial cleanup of sk_async_wait_queue */ |
1445 | while ((skb = skb_peek(&sk->sk_async_wait_queue)) && | 1445 | while ((skb = skb_peek(&sk->sk_async_wait_queue)) && |
1446 | (dma_async_is_complete(skb->dma_cookie, done, | 1446 | (dma_async_is_complete(skb->dma_cookie, done, |
1447 | used) == DMA_SUCCESS)) { | 1447 | used) == DMA_SUCCESS)) { |
1448 | __skb_dequeue(&sk->sk_async_wait_queue); | 1448 | __skb_dequeue(&sk->sk_async_wait_queue); |
1449 | kfree_skb(skb); | 1449 | kfree_skb(skb); |
1450 | } | 1450 | } |
@@ -2006,7 +2006,7 @@ void tcp_get_info(struct sock *sk, struct tcp_info *info) | |||
2006 | info->tcpi_options |= TCPI_OPT_WSCALE; | 2006 | info->tcpi_options |= TCPI_OPT_WSCALE; |
2007 | info->tcpi_snd_wscale = tp->rx_opt.snd_wscale; | 2007 | info->tcpi_snd_wscale = tp->rx_opt.snd_wscale; |
2008 | info->tcpi_rcv_wscale = tp->rx_opt.rcv_wscale; | 2008 | info->tcpi_rcv_wscale = tp->rx_opt.rcv_wscale; |
2009 | } | 2009 | } |
2010 | 2010 | ||
2011 | if (tp->ecn_flags&TCP_ECN_OK) | 2011 | if (tp->ecn_flags&TCP_ECN_OK) |
2012 | info->tcpi_options |= TCPI_OPT_ECN; | 2012 | info->tcpi_options |= TCPI_OPT_ECN; |