From 56f2f9d50a31a0633d7ea36fbd37c715aead7c7c Mon Sep 17 00:00:00 2001
From: Ian Campbell <Ian.Campbell@citrix.com>
Date: Tue, 18 Oct 2011 22:55:11 +0000
Subject: [PATCH] --- yaml --- r: 266886 b: refs/heads/master c:
 a0bec1cd8f7ac966f2885f7e56ec44df87bab738 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/skbuff.h | 1 -
 trunk/net/core/pktgen.c      | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5fe325801541..4c514c8ec675 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e049f28883126c689cf95859480d9ee4ab23b7fa
+refs/heads/master: a0bec1cd8f7ac966f2885f7e56ec44df87bab738
diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h
index 77ddf2de712f..1ebf1ea29d60 100644
--- a/trunk/include/linux/skbuff.h
+++ b/trunk/include/linux/skbuff.h
@@ -1786,7 +1786,6 @@ static inline void *skb_frag_address_safe(const skb_frag_t *frag)
 static inline void __skb_frag_set_page(skb_frag_t *frag, struct page *page)
 {
 	frag->page = page;
-	__skb_frag_ref(frag);
 }
 
 /**
diff --git a/trunk/net/core/pktgen.c b/trunk/net/core/pktgen.c
index 38d657737498..6bbf00801f61 100644
--- a/trunk/net/core/pktgen.c
+++ b/trunk/net/core/pktgen.c
@@ -2602,6 +2602,7 @@ static void pktgen_finalize_skb(struct pktgen_dev *pkt_dev, struct sk_buff *skb,
 				if (!pkt_dev->page)
 					break;
 			}
+			get_page(pkt_dev->page);
 			skb_frag_set_page(skb, i, pkt_dev->page);
 			skb_shinfo(skb)->frags[i].page_offset = 0;
 			/*last fragment, fill rest of data*/