From patchwork Sun May 22 05:46:09 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Grumbach, Emmanuel" X-Patchwork-Id: 96718 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 5DB6DB6FA7 for ; Sun, 22 May 2011 15:46:32 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751285Ab1EVFqO (ORCPT ); Sun, 22 May 2011 01:46:14 -0400 Received: from mga11.intel.com ([192.55.52.93]:5037 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751252Ab1EVFqN (ORCPT ); Sun, 22 May 2011 01:46:13 -0400 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 21 May 2011 22:46:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.65,251,1304319600"; d="scan'208";a="5279925" Received: from iapp029.jer.intel.com (HELO localhost.localdomain) ([10.12.252.35]) by fmsmga002.fm.intel.com with ESMTP; 21 May 2011 22:46:11 -0700 From: emmanuel.grumbach@intel.com To: davem@davemloft.net, netdev@vger.kernel.org Cc: Emmanuel Grumbach Subject: [PATCH] net: skb_trim explicitely check the linearity instead of data_len Date: Sun, 22 May 2011 08:46:09 +0300 Message-Id: <1306043169-26659-1-git-send-email-emmanuel.grumbach@intel.com> X-Mailer: git-send-email 1.7.0.7 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Emmanuel Grumbach 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 --- include/linux/skbuff.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) 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; }