From 6b9db5f4096e8d3d6ca5203a5c23a556db41d30d Mon Sep 17 00:00:00 2001
From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Date: Sat, 21 May 2011 19:46:09 +0000
Subject: [PATCH] --- yaml --- r: 247971 b: refs/heads/master c:
 c4264f27e83968ddfe3f0cfe7a33adfb320e1e42 h: refs/heads/master i:   247969:
 a221f3a9ab1a15ccb73290f3fd20a35c02776c45   247967:
 64d4f17cbf759fd66560f356ec306808fb084ccf v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/skbuff.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 40c871e69810..d5d3b8cf9437 100644
--- 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
index 8cac356b77b2..aeaad97e6815 100644
--- 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;
 	}