Merge tag 'ecryptfs-3.18-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / net / netfilter / nfnetlink.c

diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c
index f37f0716a9fc04e58f69bc826e827ce99546cec2..6c5a915cfa758bb4d8187dac9dc606201e99b458 100644 (file)
--- a/net/netfilter/nfnetlink.c
+++ b/net/netfilter/nfnetlink.c
@@ -381,7 +381,7 @@ replay:
                         */
                        if (err == -EAGAIN) {
                                nfnl_err_reset(&err_list);
-                               ss->abort(skb);
+                               ss->abort(oskb);
                                nfnl_unlock(subsys_id);
                                kfree_skb(nskb);
                                goto replay;
@@ -418,9 +418,9 @@ ack:
        }
 done:
        if (success && done)
-               ss->commit(skb);
+               ss->commit(oskb);
        else
-               ss->abort(skb);
+               ss->abort(oskb);
 
        nfnl_err_deliver(&err_list, oskb);
        nfnl_unlock(subsys_id);