diff options
| author |   Steven Whitehouse <swhiteho@redhat.com> | 2006-08-29 11:39:34 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-08-29 11:39:34 -0400 |
| commit | 83b7a664a0c7c39ccfa4c72535dc1c001d4e7a18 (patch) | |
| tree | 5ba3bbbe977c2047658b41e22d6b2abd5686bf15 /net/netfilter/nfnetlink_log.c | |
| parent | [GFS2] Allow mounting of gfs2 and gfs2meta at the same time (diff) | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-serial (diff) | |
| download | linux-dev-83b7a664a0c7c39ccfa4c72535dc1c001d4e7a18.tar.xz linux-dev-83b7a664a0c7c39ccfa4c72535dc1c001d4e7a18.zip | |
Merge branch 'master' into gfs2
Diffstat (limited to 'net/netfilter/nfnetlink_log.c')
| -rw-r--r-- | net/netfilter/nfnetlink_log.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c index 61cdda4e5d3b..b59d3b2bde21 100644 --- a/net/netfilter/nfnetlink_log.c +++ b/net/netfilter/nfnetlink_log.c @@ -366,6 +366,9 @@ __nfulnl_send(struct nfulnl_instance *inst) if (timer_pending(&inst->timer)) del_timer(&inst->timer); + if (!inst->skb) + return 0; + if (inst->qlen > 1) inst->lastnlh->nlmsg_type = NLMSG_DONE; |