---

yaml --- r: 266886 b: refs/heads/master c: a0bec1c h: refs/heads/master v: v3
git-mirror · Oct 19, 2011 · 56f2f9d · 56f2f9d
1 parent 041c413
commit 56f2f9d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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*/
-Original file line number
+Diff line change
@@ Expand Up @@
     static inline void __skb_frag_set_page(skb_frag_t *frag, struct page *page)
     {
     	frag->page = page;
-    	__skb_frag_ref(frag);
     }
     /**
@@ Expand Down @@