diff options
| author | Ian Campbell <Ian.Campbell@citrix.com> | 2011-08-22 23:45:01 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-08-24 17:52:12 -0700 |
| commit | 804cf14ea5ceca46554d5801e2817bba8116b7e5 (patch) | |
| tree | 94da9b8e7f6c7cfdaae1d0812c4b7a6d5d001454 /net/xfrm/xfrm_ipcomp.c | |
| parent | 408dadf03fe365f12f85d5c3d959f4bb888b9f3e (diff) | |
| download | talos-op-linux-804cf14ea5ceca46554d5801e2817bba8116b7e5.tar.gz talos-op-linux-804cf14ea5ceca46554d5801e2817bba8116b7e5.zip | |
net: xfrm: convert to SKB frag APIs
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: netdev@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm/xfrm_ipcomp.c')
| -rw-r--r-- | net/xfrm/xfrm_ipcomp.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/net/xfrm/xfrm_ipcomp.c b/net/xfrm/xfrm_ipcomp.c index fc91ad7ee26e..f781b9ab8a54 100644 --- a/net/xfrm/xfrm_ipcomp.c +++ b/net/xfrm/xfrm_ipcomp.c @@ -70,26 +70,29 @@ static int ipcomp_decompress(struct xfrm_state *x, struct sk_buff *skb) while ((scratch += len, dlen -= len) > 0) { skb_frag_t *frag; + struct page *page; err = -EMSGSIZE; if (WARN_ON(skb_shinfo(skb)->nr_frags >= MAX_SKB_FRAGS)) goto out; frag = skb_shinfo(skb)->frags + skb_shinfo(skb)->nr_frags; - frag->page = alloc_page(GFP_ATOMIC); + page = alloc_page(GFP_ATOMIC); err = -ENOMEM; - if (!frag->page) + if (!page) goto out; + __skb_frag_set_page(frag, page); + len = PAGE_SIZE; if (dlen < len) len = dlen; - memcpy(page_address(frag->page), scratch, len); - frag->page_offset = 0; frag->size = len; + memcpy(skb_frag_address(frag), scratch, len); + skb->truesize += len; skb->data_len += len; skb->len += len; |
