UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: skb_can_coalesce returns a boolean 

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2012-04-23 17:48:27 +00:00 committed by David S. Miller
parent 783c175f90
commit 38ba0a65fa
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/skbuff.h
View File

@ -1963,8 +1963,8 @@ static inline int skb_add_data(struct sk_buff *skb,
return -EFAULT; return -EFAULT;
} }
static inline int skb_can_coalesce(struct sk_buff *skb, int i, static inline bool skb_can_coalesce(struct sk_buff *skb, int i,
const struct page *page, int off) const struct page *page, int off)
{ {
if (i) { if (i) {
const struct skb_frag_struct *frag = &skb_shinfo(skb)->frags[i - 1]; 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) && return page == skb_frag_page(frag) &&
off == frag->page_offset + skb_frag_size(frag); off == frag->page_offset + skb_frag_size(frag);
} }
return 0; return false;
} }
static inline int __skb_linearize(struct sk_buff *skb) static inline int __skb_linearize(struct sk_buff *skb)

3
net/ipv4/tcp.c
View File

@ -848,9 +848,10 @@ static ssize_t do_tcp_sendpages(struct sock *sk, struct page **pages, int poffse
while (psize > 0) { while (psize > 0) {
struct sk_buff *skb = tcp_write_queue_tail(sk); struct sk_buff *skb = tcp_write_queue_tail(sk);
struct page *page = pages[poffset / PAGE_SIZE]; struct page *page = pages[poffset / PAGE_SIZE];
int copy, i, can_coalesce; int copy, i;
int offset = poffset % PAGE_SIZE; int offset = poffset % PAGE_SIZE;
int size = min_t(size_t, psize, PAGE_SIZE - offset); int size = min_t(size_t, psize, PAGE_SIZE - offset);
bool can_coalesce;
if (!tcp_send_head(sk) || (copy = size_goal - skb->len) <= 0) { if (!tcp_send_head(sk) || (copy = size_goal - skb->len) <= 0) {
new_segment: new_segment: