mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 10:57:46 +00:00
[NETFILTER]: nfnetlink_log: kill duplicate code
Kill some cut'n'paste effect. Just after __nfulnl_send() returning, inst->skb is always NULL. Signed-off-by: Michal Miroslaw <mirq-linux@rere.qmqm.pl> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
5faa1f4cb5
commit
e35670614d
1 changed files with 14 additions and 16 deletions
|
@ -188,7 +188,7 @@ instance_create(u_int16_t group_num, int pid)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __nfulnl_send(struct nfulnl_instance *inst);
|
static void __nfulnl_flush(struct nfulnl_instance *inst);
|
||||||
|
|
||||||
static void
|
static void
|
||||||
__instance_destroy(struct nfulnl_instance *inst)
|
__instance_destroy(struct nfulnl_instance *inst)
|
||||||
|
@ -202,17 +202,8 @@ __instance_destroy(struct nfulnl_instance *inst)
|
||||||
/* then flush all pending packets from skb */
|
/* then flush all pending packets from skb */
|
||||||
|
|
||||||
spin_lock_bh(&inst->lock);
|
spin_lock_bh(&inst->lock);
|
||||||
if (inst->skb) {
|
if (inst->skb)
|
||||||
/* timer "holds" one reference (we have one more) */
|
__nfulnl_flush(inst);
|
||||||
if (del_timer(&inst->timer))
|
|
||||||
instance_put(inst);
|
|
||||||
if (inst->qlen)
|
|
||||||
__nfulnl_send(inst);
|
|
||||||
if (inst->skb) {
|
|
||||||
kfree_skb(inst->skb);
|
|
||||||
inst->skb = NULL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
spin_unlock_bh(&inst->lock);
|
spin_unlock_bh(&inst->lock);
|
||||||
|
|
||||||
/* and finally put the refcount */
|
/* and finally put the refcount */
|
||||||
|
@ -364,6 +355,16 @@ __nfulnl_send(struct nfulnl_instance *inst)
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
__nfulnl_flush(struct nfulnl_instance *inst)
|
||||||
|
{
|
||||||
|
/* timer holds a reference */
|
||||||
|
if (del_timer(&inst->timer))
|
||||||
|
instance_put(inst);
|
||||||
|
if (inst->skb)
|
||||||
|
__nfulnl_send(inst);
|
||||||
|
}
|
||||||
|
|
||||||
static void nfulnl_timer(unsigned long data)
|
static void nfulnl_timer(unsigned long data)
|
||||||
{
|
{
|
||||||
struct nfulnl_instance *inst = (struct nfulnl_instance *)data;
|
struct nfulnl_instance *inst = (struct nfulnl_instance *)data;
|
||||||
|
@ -650,10 +651,7 @@ nfulnl_log_packet(unsigned int pf,
|
||||||
* enough room in the skb left. flush to userspace. */
|
* enough room in the skb left. flush to userspace. */
|
||||||
UDEBUG("flushing old skb\n");
|
UDEBUG("flushing old skb\n");
|
||||||
|
|
||||||
/* timer "holds" one reference (we have another one) */
|
__nfulnl_flush(inst);
|
||||||
if (del_timer(&inst->timer))
|
|
||||||
instance_put(inst);
|
|
||||||
__nfulnl_send(inst);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!inst->skb) {
|
if (!inst->skb) {
|
||||||
|
|
Loading…
Reference in a new issue