From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965371AbXBLUXi (ORCPT ); Mon, 12 Feb 2007 15:23:38 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S965376AbXBLUXi (ORCPT ); Mon, 12 Feb 2007 15:23:38 -0500 Received: from rere.qmqm.pl ([86.63.132.164]:33407 "EHLO rere.qmqm.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965371AbXBLUXh (ORCPT ); Mon, 12 Feb 2007 15:23:37 -0500 Date: Mon, 12 Feb 2007 21:23:19 +0100 From: =?iso-8859-2?Q?Micha=B3_Miros=B3aw?= To: netfilter-devel@lists.netfilter.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 2.6.20 14/14] nfnetlink_log: micro-optimization: inst->skb != NULL in __nfulnl_send() Message-ID: <20070212202319.GE28704@rere.qmqm.pl> References: <20070212003738.GA8262@rere.qmqm.pl> <20070212202052.GA28704@rere.qmqm.pl> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-2 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20070212202052.GA28704@rere.qmqm.pl> User-Agent: Mutt/1.5.9i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org No other function calls __nfulnl_send() with inst->skb == NULL than nfulnl_timer(). Signed-off-by: Michał Mirosław --- linux-2.6.20/net/netfilter/nfnetlink_log.c.12 2007-02-12 17:58:01.000000000 +0100 +++ linux-2.6.20/net/netfilter/nfnetlink_log.c 2007-02-12 17:58:56.000000000 +0100 @@ -375,9 +375,6 @@ __nfulnl_send(struct nfulnl_instance *in { int status; - if (!inst->skb) - return 0; - if (inst->qlen > 1) inst->lastnlh->nlmsg_type = NLMSG_DONE; @@ -403,7 +400,8 @@ static void nfulnl_timer(unsigned long d spin_lock_bh(&inst->lock); if (timer_pending(&inst->timer)) /* is it always true or false here? */ del_timer(&inst->timer); - __nfulnl_send(inst); + if (inst->skb) + __nfulnl_send(inst); spin_unlock_bh(&inst->lock); instance_put(inst); }