diff options
author | Ian Campbell <Ian.Campbell@citrix.com> | 2011-08-22 23:44:58 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-08-24 17:52:11 -0700 |
commit | ea2ab69379a941c6f8884e290fdd28c93936a778 (patch) | |
tree | c02aa9c5ed66b1640b54bb6b763d131b9419be29 /include/linux/skbuff.h | |
parent | 15133fbbb91ae695f153fb48daa6a1a8af4a5032 (diff) | |
download | op-kernel-dev-ea2ab69379a941c6f8884e290fdd28c93936a778.zip op-kernel-dev-ea2ab69379a941c6f8884e290fdd28c93936a778.tar.gz |
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/skbuff.h')
-rw-r--r-- | include/linux/skbuff.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 7b0e177..8d42628 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, } static inline int skb_can_coalesce(struct sk_buff *skb, int i, - struct page *page, int off) + const struct page *page, int off) { if (i) { struct skb_frag_struct *frag = &skb_shinfo(skb)->frags[i - 1]; - return page == frag->page && + return page == skb_frag_page(frag) && off == frag->page_offset + frag->size; } return 0; |