Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next

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

diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index a8be9b72e6cd2ca34166bba49a532f4f92e86e9e..7999e70c3bfbe69f1374087cf9bd8c16d7e813cd 100644 (file)
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -636,11 +636,11 @@ ctnetlink_conntrack_event(unsigned int events, struct nf_ct_event *item)
        if (events & (1 << IPCT_DESTROY)) {
                type = IPCTNL_MSG_CT_DELETE;
                group = NFNLGRP_CONNTRACK_DESTROY;
-       } else  if (events & ((1 << IPCT_NEW) | (1 << IPCT_RELATED))) {
+       } else if (events & ((1 << IPCT_NEW) | (1 << IPCT_RELATED))) {
                type = IPCTNL_MSG_CT_NEW;
                flags = NLM_F_CREATE|NLM_F_EXCL;
                group = NFNLGRP_CONNTRACK_NEW;
-       } else  if (events) {
+       } else if (events) {
                type = IPCTNL_MSG_CT_NEW;
                group = NFNLGRP_CONNTRACK_UPDATE;
        } else
@@ -1122,8 +1122,8 @@ static int ctnetlink_flush_conntrack(struct net *net,
                        return PTR_ERR(filter);
        }
 
-       nf_ct_iterate_cleanup(net, ctnetlink_filter_match, filter,
-                             portid, report);
+       nf_ct_iterate_cleanup_net(net, ctnetlink_filter_match, filter,
+                                 portid, report);
        kfree(filter);
 
        return 0;
@@ -1132,7 +1132,8 @@ static int ctnetlink_flush_conntrack(struct net *net,
 static int ctnetlink_del_conntrack(struct net *net, struct sock *ctnl,
                                   struct sk_buff *skb,
                                   const struct nlmsghdr *nlh,
-                                  const struct nlattr * const cda[])
+                                  const struct nlattr * const cda[],
+                                  struct netlink_ext_ack *extack)
 {
        struct nf_conntrack_tuple_hash *h;
        struct nf_conntrack_tuple tuple;
@@ -1184,7 +1185,8 @@ static int ctnetlink_del_conntrack(struct net *net, struct sock *ctnl,
 static int ctnetlink_get_conntrack(struct net *net, struct sock *ctnl,
                                   struct sk_buff *skb,
                                   const struct nlmsghdr *nlh,
-                                  const struct nlattr * const cda[])
+                                  const struct nlattr * const cda[],
+                                  struct netlink_ext_ack *extack)
 {
        struct nf_conntrack_tuple_hash *h;
        struct nf_conntrack_tuple tuple;
@@ -1345,7 +1347,8 @@ ctnetlink_dump_dying(struct sk_buff *skb, struct netlink_callback *cb)
 static int ctnetlink_get_ct_dying(struct net *net, struct sock *ctnl,
                                  struct sk_buff *skb,
                                  const struct nlmsghdr *nlh,
-                                 const struct nlattr * const cda[])
+                                 const struct nlattr * const cda[],
+                                 struct netlink_ext_ack *extack)
 {
        if (nlh->nlmsg_flags & NLM_F_DUMP) {
                struct netlink_dump_control c = {
@@ -1367,7 +1370,8 @@ ctnetlink_dump_unconfirmed(struct sk_buff *skb, struct netlink_callback *cb)
 static int ctnetlink_get_ct_unconfirmed(struct net *net, struct sock *ctnl,
                                        struct sk_buff *skb,
                                        const struct nlmsghdr *nlh,
-                                       const struct nlattr * const cda[])
+                                       const struct nlattr * const cda[],
+                                       struct netlink_ext_ack *extack)
 {
        if (nlh->nlmsg_flags & NLM_F_DUMP) {
                struct netlink_dump_control c = {
@@ -1906,7 +1910,8 @@ err1:
 static int ctnetlink_new_conntrack(struct net *net, struct sock *ctnl,
                                   struct sk_buff *skb,
                                   const struct nlmsghdr *nlh,
-                                  const struct nlattr * const cda[])
+                                  const struct nlattr * const cda[],
+                                  struct netlink_ext_ack *extack)
 {
        struct nf_conntrack_tuple otuple, rtuple;
        struct nf_conntrack_tuple_hash *h = NULL;
@@ -2071,7 +2076,8 @@ ctnetlink_ct_stat_cpu_dump(struct sk_buff *skb, struct netlink_callback *cb)
 static int ctnetlink_stat_ct_cpu(struct net *net, struct sock *ctnl,
                                 struct sk_buff *skb,
                                 const struct nlmsghdr *nlh,
-                                const struct nlattr * const cda[])
+                                const struct nlattr * const cda[],
+                                struct netlink_ext_ack *extack)
 {
        if (nlh->nlmsg_flags & NLM_F_DUMP) {
                struct netlink_dump_control c = {
@@ -2116,7 +2122,8 @@ nlmsg_failure:
 
 static int ctnetlink_stat_ct(struct net *net, struct sock *ctnl,
                             struct sk_buff *skb, const struct nlmsghdr *nlh,
-                            const struct nlattr * const cda[])
+                            const struct nlattr * const cda[],
+                            struct netlink_ext_ack *extack)
 {
        struct sk_buff *skb2;
        int err;
@@ -2778,7 +2785,8 @@ out:
 static int ctnetlink_dump_exp_ct(struct net *net, struct sock *ctnl,
                                 struct sk_buff *skb,
                                 const struct nlmsghdr *nlh,
-                                const struct nlattr * const cda[])
+                                const struct nlattr * const cda[],
+                                struct netlink_ext_ack *extack)
 {
        int err;
        struct nfgenmsg *nfmsg = nlmsg_data(nlh);
@@ -2822,7 +2830,8 @@ static int ctnetlink_dump_exp_ct(struct net *net, struct sock *ctnl,
 
 static int ctnetlink_get_expect(struct net *net, struct sock *ctnl,
                                struct sk_buff *skb, const struct nlmsghdr *nlh,
-                               const struct nlattr * const cda[])
+                               const struct nlattr * const cda[],
+                               struct netlink_ext_ack *extack)
 {
        struct nf_conntrack_tuple tuple;
        struct nf_conntrack_expect *exp;
@@ -2834,7 +2843,8 @@ static int ctnetlink_get_expect(struct net *net, struct sock *ctnl,
 
        if (nlh->nlmsg_flags & NLM_F_DUMP) {
                if (cda[CTA_EXPECT_MASTER])
-                       return ctnetlink_dump_exp_ct(net, ctnl, skb, nlh, cda);
+                       return ctnetlink_dump_exp_ct(net, ctnl, skb, nlh, cda,
+                                                    extack);
                else {
                        struct netlink_dump_control c = {
                                .dump = ctnetlink_exp_dump_table,
@@ -2902,7 +2912,8 @@ out:
 
 static int ctnetlink_del_expect(struct net *net, struct sock *ctnl,
                                struct sk_buff *skb, const struct nlmsghdr *nlh,
-                               const struct nlattr * const cda[])
+                               const struct nlattr * const cda[],
+                               struct netlink_ext_ack *extack)
 {
        struct nf_conntrack_expect *exp;
        struct nf_conntrack_tuple tuple;
@@ -3190,7 +3201,8 @@ err_ct:
 
 static int ctnetlink_new_expect(struct net *net, struct sock *ctnl,
                                struct sk_buff *skb, const struct nlmsghdr *nlh,
-                               const struct nlattr * const cda[])
+                               const struct nlattr * const cda[],
+                               struct netlink_ext_ack *extack)
 {
        struct nf_conntrack_tuple tuple;
        struct nf_conntrack_expect *exp;
@@ -3296,7 +3308,8 @@ ctnetlink_exp_stat_cpu_dump(struct sk_buff *skb, struct netlink_callback *cb)
 static int ctnetlink_stat_exp_cpu(struct net *net, struct sock *ctnl,
                                  struct sk_buff *skb,
                                  const struct nlmsghdr *nlh,
-                                 const struct nlattr * const cda[])
+                                 const struct nlattr * const cda[],
+                                 struct netlink_ext_ack *extack)
 {
        if (nlh->nlmsg_flags & NLM_F_DUMP) {
                struct netlink_dump_control c = {