net: skb_can_coalesce returns a boolean

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index f25795ca675391fb529a0ba9e45d7d18cfaaa417..4a656b51825ef485bcfaa09b01a8c6130860deea 100644 (file)
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -1963,8 +1963,8 @@ static inline int skb_add_data(struct sk_buff *skb,
        return -EFAULT;
 }
 
-static inline int skb_can_coalesce(struct sk_buff *skb, int i,
-                                  const struct page *page, int off)
+static inline bool skb_can_coalesce(struct sk_buff *skb, int i,
+                                   const struct page *page, int off)
 {
        if (i) {
                const struct skb_frag_struct *frag = &skb_shinfo(skb)->frags[i - 1];
@@ -1972,7 +1972,7 @@ static inline int skb_can_coalesce(struct sk_buff *skb, int i,
                return page == skb_frag_page(frag) &&
                       off == frag->page_offset + skb_frag_size(frag);
        }
-       return 0;
+       return false;
 }
 
 static inline int __skb_linearize(struct sk_buff *skb)

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index bcc4eab5f25148a2ae4da093732b48b38aad18b3..de6a238f0e1d035179bd4e8fe0592122614364b1 100644 (file)
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -848,9 +848,10 @@ static ssize_t do_tcp_sendpages(struct sock *sk, struct page **pages, int poffse
        while (psize > 0) {
                struct sk_buff *skb = tcp_write_queue_tail(sk);
                struct page *page = pages[poffset / PAGE_SIZE];
-               int copy, i, can_coalesce;
+               int copy, i;
                int offset = poffset % PAGE_SIZE;
                int size = min_t(size_t, psize, PAGE_SIZE - offset);
+               bool can_coalesce;
 
                if (!tcp_send_head(sk) || (copy = size_goal - skb->len) <= 0) {
 new_segment: