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

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

diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c
index 1b17a1b445a377286dacba1ce91dcb4af875513a..16fa04086880c5390ed35c8d1e1bc90c923d45de 100644 (file)
--- a/net/netfilter/nfnetlink_queue.c
+++ b/net/netfilter/nfnetlink_queue.c
@@ -1032,7 +1032,8 @@ static int nfq_id_after(unsigned int id, unsigned int max)
 static int nfqnl_recv_verdict_batch(struct net *net, struct sock *ctnl,
                                    struct sk_buff *skb,
                                    const struct nlmsghdr *nlh,
-                                   const struct nlattr * const nfqa[])
+                                   const struct nlattr * const nfqa[],
+                                   struct netlink_ext_ack *extack)
 {
        struct nfgenmsg *nfmsg = nlmsg_data(nlh);
        struct nf_queue_entry *entry, *tmp;
@@ -1136,7 +1137,8 @@ static int nfqa_parse_bridge(struct nf_queue_entry *entry,
 static int nfqnl_recv_verdict(struct net *net, struct sock *ctnl,
                              struct sk_buff *skb,
                              const struct nlmsghdr *nlh,
-                             const struct nlattr * const nfqa[])
+                             const struct nlattr * const nfqa[],
+                             struct netlink_ext_ack *extack)
 {
        struct nfgenmsg *nfmsg = nlmsg_data(nlh);
        u_int16_t queue_num = ntohs(nfmsg->res_id);
@@ -1200,7 +1202,8 @@ static int nfqnl_recv_verdict(struct net *net, struct sock *ctnl,
 
 static int nfqnl_recv_unsupp(struct net *net, struct sock *ctnl,
                             struct sk_buff *skb, const struct nlmsghdr *nlh,
-                            const struct nlattr * const nfqa[])
+                            const struct nlattr * const nfqa[],
+                            struct netlink_ext_ack *extack)
 {
        return -ENOTSUPP;
 }
@@ -1217,7 +1220,8 @@ static const struct nf_queue_handler nfqh = {
 
 static int nfqnl_recv_config(struct net *net, struct sock *ctnl,
                             struct sk_buff *skb, const struct nlmsghdr *nlh,
-                            const struct nlattr * const nfqa[])
+                            const struct nlattr * const nfqa[],
+                            struct netlink_ext_ack *extack)
 {
        struct nfgenmsg *nfmsg = nlmsg_data(nlh);
        u_int16_t queue_num = ntohs(nfmsg->res_id);