From 084b3721d28cdc515dbb0013d849ad2e4017781b Mon Sep 17 00:00:00 2001
From: Ian Campbell <Ian.Campbell@citrix.com>
Date: Mon, 22 Aug 2011 23:45:01 +0000
Subject: [PATCH] --- yaml --- r: 265531 b: refs/heads/master c:
 804cf14ea5ceca46554d5801e2817bba8116b7e5 h: refs/heads/master i:   265529:
 daa36486a5029a1fe4435197717e61512ebacba4   265527:
 108ca52bea5486bd40f3cf8ad802d05e4507c242 v: v3

---
 [refs]                       |  2 +-
 trunk/net/xfrm/xfrm_ipcomp.c | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 59ca4732d7de..88a48b415214 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 408dadf03fe365f12f85d5c3d959f4bb888b9f3e
+refs/heads/master: 804cf14ea5ceca46554d5801e2817bba8116b7e5
diff --git a/trunk/net/xfrm/xfrm_ipcomp.c b/trunk/net/xfrm/xfrm_ipcomp.c
index fc91ad7ee26e..f781b9ab8a54 100644
--- a/trunk/net/xfrm/xfrm_ipcomp.c
+++ b/trunk/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;