3 files changed, 9 insertions, 13 deletions

diff --git a/net/ipv6/netfilter/nft_masq_ipv6.c b/net/ipv6/netfilter/nft_masq_ipv6.c
index 529c119cbb14..cd1ac1637a05 100644
--- a/net/ipv6/netfilter/nft_masq_ipv6.c
+++ b/net/ipv6/netfilter/nft_masq_ipv6.c
@@ -18,19 +18,16 @@
 #include <net/netfilter/ipv6/nf_nat_masquerade.h>
 
 static void nft_masq_ipv6_eval(const struct nft_expr *expr,
-                               struct nft_data data[NFT_REG_MAX + 1],
+                               struct nft_regs *regs,
                                const struct nft_pktinfo *pkt)
 {
         struct nft_masq *priv = nft_expr_priv(expr);
         struct nf_nat_range range;
-        unsigned int verdict;
 
         memset(&range, 0, sizeof(range));
         range.flags = priv->flags;
 
-        verdict = nf_nat_masquerade_ipv6(pkt->skb, &range, pkt->out);
-
-        data[NFT_REG_VERDICT].verdict = verdict;
+        regs->verdict.code = nf_nat_masquerade_ipv6(pkt->skb, &range, pkt->out);
 }
 
 static struct nft_expr_type nft_masq_ipv6_type;
diff --git a/net/ipv6/netfilter/nft_redir_ipv6.c b/net/ipv6/netfilter/nft_redir_ipv6.c
index 11820b6b3613..effd393bd517 100644
--- a/net/ipv6/netfilter/nft_redir_ipv6.c
+++ b/net/ipv6/netfilter/nft_redir_ipv6.c
@@ -18,26 +18,25 @@
 #include <net/netfilter/nf_nat_redirect.h>
 
 static void nft_redir_ipv6_eval(const struct nft_expr *expr,
-                                struct nft_data data[NFT_REG_MAX + 1],
+                                struct nft_regs *regs,
                                 const struct nft_pktinfo *pkt)
 {
         struct nft_redir *priv = nft_expr_priv(expr);
         struct nf_nat_range range;
-        unsigned int verdict;
 
         memset(&range, 0, sizeof(range));
         if (priv->sreg_proto_min) {
                 range.min_proto.all =
-                        *(__be16 *)&data[priv->sreg_proto_min].data[0];
+                        *(__be16 *)&regs->data[priv->sreg_proto_min],
                 range.max_proto.all =
-                        *(__be16 *)&data[priv->sreg_proto_max].data[0];
+                        *(__be16 *)&regs->data[priv->sreg_proto_max],
                 range.flags |= NF_NAT_RANGE_PROTO_SPECIFIED;
         }
 
         range.flags |= priv->flags;
 
-        verdict = nf_nat_redirect_ipv6(pkt->skb, &range, pkt->ops->hooknum);
-        data[NFT_REG_VERDICT].verdict = verdict;
+        regs->verdict.code = nf_nat_redirect_ipv6(pkt->skb, &range,
+                                                  pkt->ops->hooknum);
 }
 
 static struct nft_expr_type nft_redir_ipv6_type;
diff --git a/net/ipv6/netfilter/nft_reject_ipv6.c b/net/ipv6/netfilter/nft_reject_ipv6.c
index 71c7be5ee43a..d0d1540ecf87 100644
--- a/net/ipv6/netfilter/nft_reject_ipv6.c
+++ b/net/ipv6/netfilter/nft_reject_ipv6.c
@@ -20,7 +20,7 @@
 #include <net/netfilter/ipv6/nf_reject.h>
 
 static void nft_reject_ipv6_eval(const struct nft_expr *expr,
-                                 struct nft_data data[NFT_REG_MAX + 1],
+                                 struct nft_regs *regs,
                                  const struct nft_pktinfo *pkt)
 {
         struct nft_reject *priv = nft_expr_priv(expr);
@@ -38,7 +38,7 @@ static void nft_reject_ipv6_eval(const struct nft_expr *expr,
                 break;
         }
 
-        data[NFT_REG_VERDICT].verdict = NF_DROP;
+        regs->verdict.code = NF_DROP;
 }
 
 static struct nft_expr_type nft_reject_ipv6_type;