---

yaml --- r: 122132 b: refs/heads/master c: 0ace285 h: refs/heads/master v: v3
git-mirror · Nov 25, 2008 · 40502b5 · 40502b5
1 parent 30a9ef8
commit 40502b5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 111cc8b913b42ef07793648b1699288332f273e1
+refs/heads/master: 0ace285605314c54339710484b54814945a60df8
diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c
@@ -2018,13 +2018,10 @@ void skb_split(struct sk_buff *skb, struct sk_buff *skb1, const u32 len)
 		skb_split_no_header(skb, skb1, len, pos);
 }
 
-/* Shifting from/to a cloned skb is a no-go.
- *
- * TODO: handle cloned skbs by using pskb_expand_head()
- */
+/* Shifting from/to a cloned skb is a no-go. */
 static int skb_prepare_for_shift(struct sk_buff *skb)
 {
-	return skb_cloned(skb);
+	return skb_cloned(skb) && pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
 }
 
 /**