projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: include/net/sock.h cleanup
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
net
/
ipv4
/
tcp.c
diff --git
a/net/ipv4/tcp.c
b/net/ipv4/tcp.c
index feb2e25091b1597beb9c90dc5e5e070d62378f58..e8a80d0b5b3c8a0270290ad94a9d1c28dc82c14c 100644
(file)
--- 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,
break;
}
if (tcp_hdr(skb)->fin) {
break;
}
if (tcp_hdr(skb)->fin) {
- sk_eat_skb(sk, skb,
0
);
+ sk_eat_skb(sk, skb,
false
);
++seq;
break;
}
++seq;
break;
}
- sk_eat_skb(sk, skb,
0
);
+ sk_eat_skb(sk, skb,
false
);
if (!desc->count)
break;
tp->copied_seq = seq;
if (!desc->count)
break;
tp->copied_seq = seq;
@@
-1513,7
+1513,7
@@
int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
int target; /* Read at least this many bytes */
long timeo;
struct task_struct *user_recv = NULL;
int target; /* Read at least this many bytes */
long timeo;
struct task_struct *user_recv = NULL;
-
int copied_early = 0
;
+
bool copied_early = false
;
struct sk_buff *skb;
u32 urg_hole = 0;
struct sk_buff *skb;
u32 urg_hole = 0;
@@
-1801,7
+1801,7
@@
do_prequeue:
dma_async_memcpy_issue_pending(tp->ucopy.dma_chan);
if ((offset + used) == skb->len)
dma_async_memcpy_issue_pending(tp->ucopy.dma_chan);
if ((offset + used) == skb->len)
- copied_early =
1
;
+ copied_early =
true
;
} else
#endif
} else
#endif
@@
-1835,7
+1835,7
@@
skip_copy:
goto found_fin_ok;
if (!(flags & MSG_PEEK)) {
sk_eat_skb(sk, skb, copied_early);
goto found_fin_ok;
if (!(flags & MSG_PEEK)) {
sk_eat_skb(sk, skb, copied_early);
- copied_early =
0
;
+ copied_early =
false
;
}
continue;
}
continue;
@@
-1844,7
+1844,7
@@
skip_copy:
++*seq;
if (!(flags & MSG_PEEK)) {
sk_eat_skb(sk, skb, copied_early);
++*seq;
if (!(flags & MSG_PEEK)) {
sk_eat_skb(sk, skb, copied_early);
- copied_early =
0
;
+ copied_early =
false
;
}
break;
} while (len > 0);
}
break;
} while (len > 0);