Merge tag 'net-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[sfrench/cifs-2.6.git] / net / netfilter / nf_tables_offload.c

diff --git a/net/netfilter/nf_tables_offload.c b/net/netfilter/nf_tables_offload.c
index 7c7e06624dc3b0bad710aa903fc0ef12f1cbf3f5..9f625724a20fc27ea54ca1cdd3e747d170260410 100644 (file)
--- a/net/netfilter/nf_tables_offload.c
+++ b/net/netfilter/nf_tables_offload.c
@@ -37,7 +37,7 @@ struct nft_flow_rule *nft_flow_rule_create(struct net *net,
        struct nft_expr *expr;
 
        expr = nft_expr_first(rule);
-       while (expr->ops && expr != nft_expr_last(rule)) {
+       while (nft_expr_more(rule, expr)) {
                if (expr->ops->offload_flags & NFT_OFFLOAD_F_ACTION)
                        num_actions++;
 
@@ -61,7 +61,7 @@ struct nft_flow_rule *nft_flow_rule_create(struct net *net,
        ctx->net = net;
        ctx->dep.type = NFT_OFFLOAD_DEP_UNSPEC;
 
-       while (expr->ops && expr != nft_expr_last(rule)) {
+       while (nft_expr_more(rule, expr)) {
                if (!expr->ops->offload) {
                        err = -EOPNOTSUPP;
                        goto err_out;