Commit 9f18b6b6 authored by David Ahern's avatar David Ahern Committed by David S. Miller
Browse files

netfilter: nft_fib: Convert nft_fib4_eval to new dev helper



Convert nft_fib4_eval to the new device checking helper and
remove the duplicate code.

Signed-off-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 91a17825
Loading
Loading
Loading
Loading
+6 −21
Original line number Diff line number Diff line
@@ -76,10 +76,7 @@ void nft_fib4_eval(const struct nft_expr *expr, struct nft_regs *regs,
		.flowi4_iif = LOOPBACK_IFINDEX,
	};
	const struct net_device *oif;
	struct net_device *found;
#ifdef CONFIG_IP_ROUTE_MULTIPATH
	int i;
#endif
	const struct net_device *found;

	/*
	 * Do not set flowi4_oif, it restricts results (for example, asking
@@ -146,25 +143,13 @@ void nft_fib4_eval(const struct nft_expr *expr, struct nft_regs *regs,

       if (!oif) {
               found = FIB_RES_DEV(res);
               goto ok;
       }

#ifdef CONFIG_IP_ROUTE_MULTIPATH
	for (i = 0; i < res.fi->fib_nhs; i++) {
		struct fib_nh *nh = &res.fi->fib_nh[i];
	} else {
		if (!fib_info_nh_uses_dev(res.fi, oif))
			return;

		if (nh->nh_dev == oif) {
			found = nh->nh_dev;
			goto ok;
		}
		found = oif;
	}
	return;
#else
	found = FIB_RES_DEV(res);
	if (found != oif)
		return;
#endif
ok:

	switch (priv->result) {
	case NFT_FIB_RESULT_OIF:
		*dest = found->ifindex;