aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorIan Campbell <Ian.Campbell@citrix.com>2011-08-22 19:44:58 -0400
committerDavid S. Miller <davem@davemloft.net>2011-08-24 20:52:11 -0400
commitea2ab69379a941c6f8884e290fdd28c93936a778 (patch)
treec02aa9c5ed66b1640b54bb6b763d131b9419be29 /include/linux
parent15133fbbb91ae695f153fb48daa6a1a8af4a5032 (diff)
net: convert core to skb paged frag APIs
Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: Eric Dumazet <eric.dumazet@gmail.com> Cc: "Michał Mirosław" <mirq-linux@rere.qmqm.pl> Cc: netdev@vger.kernel.org Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/skbuff.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 7b0e1773f9cd..8d426281259d 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -1898,12 +1898,12 @@ static inline int skb_add_data(struct sk_buff *skb,
1898} 1898}
1899 1899
1900static inline int skb_can_coalesce(struct sk_buff *skb, int i, 1900static inline int skb_can_coalesce(struct sk_buff *skb, int i,
1901 struct page *page, int off) 1901 const struct page *page, int off)
1902{ 1902{
1903 if (i) { 1903 if (i) {
1904 struct skb_frag_struct *frag = &skb_shinfo(skb)->frags[i - 1]; 1904 struct skb_frag_struct *frag = &skb_shinfo(skb)->frags[i - 1];
1905 1905
1906 return page == frag->page && 1906 return page == skb_frag_page(frag) &&
1907 off == frag->page_offset + frag->size; 1907 off == frag->page_offset + frag->size;
1908 } 1908 }
1909 return 0; 1909 return 0;