[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20070212202319.GE28704@rere.qmqm.pl>
Date: Mon, 12 Feb 2007 21:23:19 +0100
From: Michał Mirosław <mirq-linux@...e.qmqm.pl>
To: netfilter-devel@...ts.netfilter.org
Cc: linux-kernel@...r.kernel.org
Subject: [PATCH 2.6.20 14/14] nfnetlink_log: micro-optimization: inst->skb != NULL in __nfulnl_send()
No other function calls __nfulnl_send() with inst->skb == NULL than nfulnl_timer().
Signed-off-by: Michał Mirosław <mirq-linux@...e.qmqm.pl>
--- 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);
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists