Merge tag 'dmaengine-4.13-rc1' of git://git.infradead.org/users/vkoul/slave-dma

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

diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
index ba6a5516dc7c724b172ee13c0456b461c47f7281..e495b5e484b11c03c26674d999e3dc31422efab9 100644 (file)
--- a/net/netfilter/ipset/ip_set_core.c
+++ b/net/netfilter/ipset/ip_set_core.c
@@ -841,14 +841,16 @@ find_free_id(struct ip_set_net *inst, const char *name, ip_set_id_t *index,
 
 static int ip_set_none(struct net *net, struct sock *ctnl, struct sk_buff *skb,
                       const struct nlmsghdr *nlh,
-                      const struct nlattr * const attr[])
+                      const struct nlattr * const attr[],
+                      struct netlink_ext_ack *extack)
 {
        return -EOPNOTSUPP;
 }
 
 static int ip_set_create(struct net *net, struct sock *ctnl,
                         struct sk_buff *skb, const struct nlmsghdr *nlh,
-                        const struct nlattr * const attr[])
+                        const struct nlattr * const attr[],
+                        struct netlink_ext_ack *extack)
 {
        struct ip_set_net *inst = ip_set_pernet(net);
        struct ip_set *set, *clash = NULL;
@@ -989,7 +991,8 @@ ip_set_destroy_set(struct ip_set *set)
 
 static int ip_set_destroy(struct net *net, struct sock *ctnl,
                          struct sk_buff *skb, const struct nlmsghdr *nlh,
-                         const struct nlattr * const attr[])
+                         const struct nlattr * const attr[],
+                         struct netlink_ext_ack *extack)
 {
        struct ip_set_net *inst = ip_set_pernet(net);
        struct ip_set *s;
@@ -1067,7 +1070,8 @@ ip_set_flush_set(struct ip_set *set)
 
 static int ip_set_flush(struct net *net, struct sock *ctnl, struct sk_buff *skb,
                        const struct nlmsghdr *nlh,
-                       const struct nlattr * const attr[])
+                       const struct nlattr * const attr[],
+                       struct netlink_ext_ack *extack)
 {
        struct ip_set_net *inst = ip_set_pernet(net);
        struct ip_set *s;
@@ -1106,7 +1110,8 @@ ip_set_setname2_policy[IPSET_ATTR_CMD_MAX + 1] = {
 
 static int ip_set_rename(struct net *net, struct sock *ctnl,
                         struct sk_buff *skb, const struct nlmsghdr *nlh,
-                        const struct nlattr * const attr[])
+                        const struct nlattr * const attr[],
+                        struct netlink_ext_ack *extack)
 {
        struct ip_set_net *inst = ip_set_pernet(net);
        struct ip_set *set, *s;
@@ -1155,7 +1160,8 @@ out:
 
 static int ip_set_swap(struct net *net, struct sock *ctnl, struct sk_buff *skb,
                       const struct nlmsghdr *nlh,
-                      const struct nlattr * const attr[])
+                      const struct nlattr * const attr[],
+                      struct netlink_ext_ack *extack)
 {
        struct ip_set_net *inst = ip_set_pernet(net);
        struct ip_set *from, *to;
@@ -1428,7 +1434,8 @@ out:
 
 static int ip_set_dump(struct net *net, struct sock *ctnl, struct sk_buff *skb,
                       const struct nlmsghdr *nlh,
-                      const struct nlattr * const attr[])
+                      const struct nlattr * const attr[],
+                      struct netlink_ext_ack *extack)
 {
        if (unlikely(protocol_failed(attr)))
                return -IPSET_ERR_PROTOCOL;
@@ -1513,7 +1520,8 @@ call_ad(struct sock *ctnl, struct sk_buff *skb, struct ip_set *set,
 
 static int ip_set_uadd(struct net *net, struct sock *ctnl, struct sk_buff *skb,
                       const struct nlmsghdr *nlh,
-                      const struct nlattr * const attr[])
+                      const struct nlattr * const attr[],
+                      struct netlink_ext_ack *extack)
 {
        struct ip_set_net *inst = ip_set_pernet(net);
        struct ip_set *set;
@@ -1567,7 +1575,8 @@ static int ip_set_uadd(struct net *net, struct sock *ctnl, struct sk_buff *skb,
 
 static int ip_set_udel(struct net *net, struct sock *ctnl, struct sk_buff *skb,
                       const struct nlmsghdr *nlh,
-                      const struct nlattr * const attr[])
+                      const struct nlattr * const attr[],
+                      struct netlink_ext_ack *extack)
 {
        struct ip_set_net *inst = ip_set_pernet(net);
        struct ip_set *set;
@@ -1621,7 +1630,8 @@ static int ip_set_udel(struct net *net, struct sock *ctnl, struct sk_buff *skb,
 
 static int ip_set_utest(struct net *net, struct sock *ctnl, struct sk_buff *skb,
                        const struct nlmsghdr *nlh,
-                       const struct nlattr * const attr[])
+                       const struct nlattr * const attr[],
+                       struct netlink_ext_ack *extack)
 {
        struct ip_set_net *inst = ip_set_pernet(net);
        struct ip_set *set;
@@ -1656,7 +1666,8 @@ static int ip_set_utest(struct net *net, struct sock *ctnl, struct sk_buff *skb,
 
 static int ip_set_header(struct net *net, struct sock *ctnl,
                         struct sk_buff *skb, const struct nlmsghdr *nlh,
-                        const struct nlattr * const attr[])
+                        const struct nlattr * const attr[],
+                        struct netlink_ext_ack *extack)
 {
        struct ip_set_net *inst = ip_set_pernet(net);
        const struct ip_set *set;
@@ -1712,7 +1723,8 @@ static const struct nla_policy ip_set_type_policy[IPSET_ATTR_CMD_MAX + 1] = {
 
 static int ip_set_type(struct net *net, struct sock *ctnl, struct sk_buff *skb,
                       const struct nlmsghdr *nlh,
-                      const struct nlattr * const attr[])
+                      const struct nlattr * const attr[],
+                      struct netlink_ext_ack *extack)
 {
        struct sk_buff *skb2;
        struct nlmsghdr *nlh2;
@@ -1770,7 +1782,8 @@ ip_set_protocol_policy[IPSET_ATTR_CMD_MAX + 1] = {
 
 static int ip_set_protocol(struct net *net, struct sock *ctnl,
                           struct sk_buff *skb, const struct nlmsghdr *nlh,
-                          const struct nlattr * const attr[])
+                          const struct nlattr * const attr[],
+                          struct netlink_ext_ack *extack)
 {
        struct sk_buff *skb2;
        struct nlmsghdr *nlh2;