git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.17-1.2187_FC5 patched with stable patch-2.6.17.13-vs2...
[linux-2.6.git]
/
net
/
netfilter
/
nfnetlink_log.c
diff --git
a/net/netfilter/nfnetlink_log.c
b/net/netfilter/nfnetlink_log.c
index
61cdda4
..
b59d3b2
100644
(file)
--- 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 (timer_pending(&inst->timer))
del_timer(&inst->timer);
+ if (!inst->skb)
+ return 0;
+
if (inst->qlen > 1)
inst->lastnlh->nlmsg_type = NLMSG_DONE;
if (inst->qlen > 1)
inst->lastnlh->nlmsg_type = NLMSG_DONE;