---

yaml --- r: 247971 b: refs/heads/master c: c4264f2 h: refs/heads/master i: 247969: a221f3a 247967: 64d4f17 v: v3
git-mirror · May 23, 2011 · 6b9db5f · 6b9db5f
1 parent 9e560a9
commit 6b9db5f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c378a9c019cf5e017d1ed24954b54fae7bebd2bc
+refs/heads/master: c4264f27e83968ddfe3f0cfe7a33adfb320e1e42
diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h
@@ -1442,7 +1442,7 @@ extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
 
 static inline void __skb_trim(struct sk_buff *skb, unsigned int len)
 {
-	if (unlikely(skb->data_len)) {
+	if (unlikely(skb_is_nonlinear(skb))) {
 		WARN_ON(1);
 		return;
 	}