aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/netfilter/nfnetlink_log.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
index e934770339d3..34de3d84e2fc 100644
--- a/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
@@ -360,9 +360,6 @@ __nfulnl_send(struct nfulnl_instance *inst)
360{ 360{
361 int status; 361 int status;
362 362
363 if (!inst->skb)
364 return 0;
365
366 if (inst->qlen > 1) 363 if (inst->qlen > 1)
367 inst->lastnlh->nlmsg_type = NLMSG_DONE; 364 inst->lastnlh->nlmsg_type = NLMSG_DONE;
368 365
@@ -386,7 +383,8 @@ static void nfulnl_timer(unsigned long data)
386 UDEBUG("timer function called, flushing buffer\n"); 383 UDEBUG("timer function called, flushing buffer\n");
387 384
388 spin_lock_bh(&inst->lock); 385 spin_lock_bh(&inst->lock);
389 __nfulnl_send(inst); 386 if (inst->skb)
387 __nfulnl_send(inst);
390 spin_unlock_bh(&inst->lock); 388 spin_unlock_bh(&inst->lock);
391 instance_put(inst); 389 instance_put(inst);
392} 390}