From patchwork Tue Jan 17 13:03:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: sjur.brandeland@stericsson.com X-Patchwork-Id: 136460 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 4F5F21007D4 for ; Wed, 18 Jan 2012 00:03:40 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753566Ab2AQNDb (ORCPT ); Tue, 17 Jan 2012 08:03:31 -0500 Received: from mail-lpp01m010-f46.google.com ([209.85.215.46]:35509 "EHLO mail-lpp01m010-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752767Ab2AQNDa (ORCPT ); Tue, 17 Jan 2012 08:03:30 -0500 Received: by lahc1 with SMTP id c1so1502868lah.19 for ; Tue, 17 Jan 2012 05:03:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=YZeDyxC23Cv38UB1O2APKrkGA6GXm+Yw61zoMjEr9TM=; b=vErytfabILsZtIuSa6DT/YzaXnnqh6i1npolG5T8SnC35tPaIvc5pIHdoknO+DnsOK BRQEpIVOyn+5S32ZE8RSe6644/oH/zstas6GFMotJg3KCa99AEqMhVYvxLoZWGW/Q3zt qedpWNd6QYsMerXkCm5rMZbPjWuTSO8CUxyWc= Received: by 10.152.111.7 with SMTP id ie7mr8168958lab.11.1326805408602; Tue, 17 Jan 2012 05:03:28 -0800 (PST) Received: from localhost.localdomain ([212.4.57.94]) by mx.google.com with ESMTPS id st7sm15487337lab.12.2012.01.17.05.03.26 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 17 Jan 2012 05:03:27 -0800 (PST) From: =?UTF-8?q?Sjur=20Br=C3=A6ndeland?= To: netdev@vger.kernel.org, David Miller Cc: =?UTF-8?q?Sjur=20Br=C3=A6ndeland?= Subject: [PATCH net 2/2] caif: Remove bad WARN_ON in caif_dev Date: Tue, 17 Jan 2012 14:03:14 +0100 Message-Id: <1326805394-2662-2-git-send-email-sjur.brandeland@stericsson.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1326805394-2662-1-git-send-email-sjur.brandeland@stericsson.com> References: <1326805394-2662-1-git-send-email-sjur.brandeland@stericsson.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Remove WARN_ON and bad handling of SKB without destructor callback in caif_flow_cb. SKB without destructor cannot be handled as an error case. Signed-off-by: Sjur Brændeland --- net/caif/caif_dev.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/net/caif/caif_dev.c b/net/caif/caif_dev.c index 61570ee..673728a 100644 --- a/net/caif/caif_dev.c +++ b/net/caif/caif_dev.c @@ -146,15 +146,17 @@ void caif_flow_cb(struct sk_buff *skb) spin_lock_bh(&caifd->flow_lock); send_xoff = caifd->xoff; caifd->xoff = 0; - if (!WARN_ON(caifd->xoff_skb_dtor == NULL)) { - WARN_ON(caifd->xoff_skb != skb); - dtor = caifd->xoff_skb_dtor; - caifd->xoff_skb = NULL; - caifd->xoff_skb_dtor = NULL; - } + dtor = caifd->xoff_skb_dtor; + + if (WARN_ON(caifd->xoff_skb != skb)) + skb = NULL; + + caifd->xoff_skb = NULL; + caifd->xoff_skb_dtor = NULL; + spin_unlock_bh(&caifd->flow_lock); - if (dtor) + if (dtor && skb) dtor(skb); if (send_xoff)