Message ID | 1306043169-26659-1-git-send-email-emmanuel.grumbach@intel.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: emmanuel.grumbach@intel.com Date: Sun, 22 May 2011 08:46:09 +0300 > From: Emmanuel Grumbach <emmanuel.grumbach@intel.com> > > The purpose of the check on data_len is to check linearity, so use the inline > helper for this. No overhead and more explicit. > > Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index bf221d6..a4f680c 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -1439,7 +1439,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; }