netfilter: nft_limit: replace pkt_bytes with bytes (6e323887) · Commits · 戴 / test

net/netfilter/nft_limit.c

+13 −13

Original line number	Diff line number	Diff line
		@@ -168,7 +168,7 @@ static const struct nft_expr_ops nft_limit_pkts_ops = {
		.dump = nft_limit_pkts_dump,
		};

		static void nft_limit_pkt_bytes_eval(const struct nft_expr *expr,
		static void nft_limit_bytes_eval(const struct nft_expr *expr,
		struct nft_regs *regs,
		const struct nft_pktinfo *pkt)
		{
		@@ -179,7 +179,7 @@ static void nft_limit_pkt_bytes_eval(const struct nft_expr *expr,
		regs->verdict.code = NFT_BREAK;
		}

		static int nft_limit_pkt_bytes_init(const struct nft_ctx *ctx,
		static int nft_limit_bytes_init(const struct nft_ctx *ctx,
		const struct nft_expr *expr,
		const struct nlattr * const tb[])
		{
		@@ -188,7 +188,7 @@ static int nft_limit_pkt_bytes_init(const struct nft_ctx *ctx,
		return nft_limit_init(priv, tb);
		}

		static int nft_limit_pkt_bytes_dump(struct sk_buff *skb,
		static int nft_limit_bytes_dump(struct sk_buff *skb,
		const struct nft_expr *expr)
		{
		const struct nft_limit *priv = nft_expr_priv(expr);
		@@ -196,12 +196,12 @@ static int nft_limit_pkt_bytes_dump(struct sk_buff *skb,
		return nft_limit_dump(skb, priv, NFT_LIMIT_PKT_BYTES);
		}

		static const struct nft_expr_ops nft_limit_pkt_bytes_ops = {
		static const struct nft_expr_ops nft_limit_bytes_ops = {
		.type = &nft_limit_type,
		.size = NFT_EXPR_SIZE(sizeof(struct nft_limit)),
		.eval = nft_limit_pkt_bytes_eval,
		.init = nft_limit_pkt_bytes_init,
		.dump = nft_limit_pkt_bytes_dump,
		.eval = nft_limit_bytes_eval,
		.init = nft_limit_bytes_init,
		.dump = nft_limit_bytes_dump,
		};

		static const struct nft_expr_ops *
		@@ -215,7 +215,7 @@ nft_limit_select_ops(const struct nft_ctx *ctx,
		case NFT_LIMIT_PKTS:
		return &nft_limit_pkts_ops;
		case NFT_LIMIT_PKT_BYTES:
		return &nft_limit_pkt_bytes_ops;
		return &nft_limit_bytes_ops;
		}
		return ERR_PTR(-EOPNOTSUPP);
		}

Admin message