diff options
author | Eric Dumazet <edumazet@google.com> | 2012-05-16 18:48:15 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-05-17 04:50:21 -0400 |
commit | dc6b9b78234fecdc6d2ca5e1629185718202bcf5 (patch) | |
tree | 81faf65c9cd9747d8dfe2828ff624507459bdf24 /net/ipv4 | |
parent | 1f352920b908247273a7c1937fd8c341cc1cedb1 (diff) |
net: include/net/sock.h cleanup
bool/const conversions where possible
__inline__ -> inline
space cleanups
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-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 feb2e25091b1..e8a80d0b5b3c 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c | |||
@@ -1473,11 +1473,11 @@ int tcp_read_sock(struct sock *sk, read_descriptor_t *desc, | |||
1473 | break; | 1473 | break; |
1474 | } | 1474 | } |
1475 | if (tcp_hdr(skb)->fin) { | 1475 | if (tcp_hdr(skb)->fin) { |
1476 | sk_eat_skb(sk, skb, 0); | 1476 | sk_eat_skb(sk, skb, false); |
1477 | ++seq; | 1477 | ++seq; |
1478 | break; | 1478 | break; |
1479 | } | 1479 | } |
1480 | sk_eat_skb(sk, skb, 0); | 1480 | sk_eat_skb(sk, skb, false); |
1481 | if (!desc->count) | 1481 | if (!desc->count) |
1482 | break; | 1482 | break; |
1483 | tp->copied_seq = seq; | 1483 | tp->copied_seq = seq; |
@@ -1513,7 +1513,7 @@ int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, | |||
1513 | int target; /* Read at least this many bytes */ | 1513 | int target; /* Read at least this many bytes */ |
1514 | long timeo; | 1514 | long timeo; |
1515 | struct task_struct *user_recv = NULL; | 1515 | struct task_struct *user_recv = NULL; |
1516 | int copied_early = 0; | 1516 | bool copied_early = false; |
1517 | struct sk_buff *skb; | 1517 | struct sk_buff *skb; |
1518 | u32 urg_hole = 0; | 1518 | u32 urg_hole = 0; |
1519 | 1519 | ||
@@ -1801,7 +1801,7 @@ do_prequeue: | |||
1801 | dma_async_memcpy_issue_pending(tp->ucopy.dma_chan); | 1801 | dma_async_memcpy_issue_pending(tp->ucopy.dma_chan); |
1802 | 1802 | ||
1803 | if ((offset + used) == skb->len) | 1803 | if ((offset + used) == skb->len) |
1804 | copied_early = 1; | 1804 | copied_early = true; |
1805 | 1805 | ||
1806 | } else | 1806 | } else |
1807 | #endif | 1807 | #endif |
@@ -1835,7 +1835,7 @@ skip_copy: | |||
1835 | goto found_fin_ok; | 1835 | goto found_fin_ok; |
1836 | if (!(flags & MSG_PEEK)) { | 1836 | if (!(flags & MSG_PEEK)) { |
1837 | sk_eat_skb(sk, skb, copied_early); | 1837 | sk_eat_skb(sk, skb, copied_early); |
1838 | copied_early = 0; | 1838 | copied_early = false; |
1839 | } | 1839 | } |
1840 | continue; | 1840 | continue; |
1841 | 1841 | ||
@@ -1844,7 +1844,7 @@ skip_copy: | |||
1844 | ++*seq; | 1844 | ++*seq; |
1845 | if (!(flags & MSG_PEEK)) { | 1845 | if (!(flags & MSG_PEEK)) { |
1846 | sk_eat_skb(sk, skb, copied_early); | 1846 | sk_eat_skb(sk, skb, copied_early); |
1847 | copied_early = 0; | 1847 | copied_early = false; |
1848 | } | 1848 | } |
1849 | break; | 1849 | break; |
1850 | } while (len > 0); | 1850 | } while (len > 0); |