diff options
| author |   Pablo Neira Ayuso <pablo@netfilter.org> | 2015-12-15 19:41:57 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-12-28 18:43:15 +0100 |
| commit | 5913beaf0d70f97135ed7191c028fd88b3848864 (patch) | |
| tree | 04c2ca897f3c5321a6189a20c7ef45df4339e749 /net/netfilter/nfnetlink.c | |
| parent | netfilter: nfnetlink: pass down netns pointer to call() and call_rcu() (diff) | |
| download | linux-dev-5913beaf0d70f97135ed7191c028fd88b3848864.tar.xz linux-dev-5913beaf0d70f97135ed7191c028fd88b3848864.zip | |
netfilter: nfnetlink: pass down netns pointer to commit() and abort() callbacks
Adapt callsites to avoid recurrent lookup of the netns pointer.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/nfnetlink.c')
| -rw-r--r-- | net/netfilter/nfnetlink.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c index 7012154b28ca..a7ba23353dab 100644 --- a/net/netfilter/nfnetlink.c +++ b/net/netfilter/nfnetlink.c @@ -425,15 +425,15 @@ next: } done: if (status & NFNL_BATCH_REPLAY) { - ss->abort(oskb); + ss->abort(net, oskb); nfnl_err_reset(&err_list); nfnl_unlock(subsys_id); kfree_skb(skb); goto replay; } else if (status == NFNL_BATCH_DONE) { - ss->commit(oskb); + ss->commit(net, oskb); } else { - ss->abort(oskb); + ss->abort(net, oskb); } nfnl_err_deliver(&err_list, oskb); |