Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eea39946 authored by Roopa Prabhu's avatar Roopa Prabhu Committed by David S. Miller
Browse files

rename RTNH_F_EXTERNAL to RTNH_F_OFFLOAD 



RTNH_F_EXTERNAL today is printed as "offload" in iproute2 output.

This patch renames the flag to be consistent with what the user sees.

Signed-off-by: default avatarRoopa Prabhu <roopa@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c1c52db1

include/uapi/linux/rtnetlink.h

+1 −1
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ struct rtnexthop { 
#define RTNH_F_DEAD		1	/* Nexthop is dead (used by multipath)	*/

#define RTNH_F_PERVASIVE	2	/* Do recursive gateway lookup	*/

#define RTNH_F_ONLINK		4	/* Gateway is forced on link	*/

#define RTNH_F_EXTERNAL		8	/* Route installed externally	*/

#define RTNH_F_OFFLOAD		8	/* offloaded route */



/* Macros to handle hexthops */

net/ipv4/fib_trie.c

+1 −1
Original line number Diff line number Diff line
@@ -1764,7 +1764,7 @@ void fib_table_flush_external(struct fib_table *tb) 
			/* record local slen */

			slen = fa->fa_slen;



			if (!fi || !(fi->fib_flags & RTNH_F_EXTERNAL))

			if (!fi || !(fi->fib_flags & RTNH_F_OFFLOAD))

				continue;



			netdev_switch_fib_ipv4_del(n->key,

net/switchdev/switchdev.c

+3 −3
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ int netdev_switch_fib_ipv4_add(u32 dst, int dst_len, struct fib_info *fi, 
					      fi, tos, type, nlflags,

					      tb_id);

		if (!err)

			fi->fib_flags |= RTNH_F_EXTERNAL;

			fi->fib_flags |= RTNH_F_OFFLOAD;

	}



	return err;
@@ -364,7 +364,7 @@ int netdev_switch_fib_ipv4_del(u32 dst, int dst_len, struct fib_info *fi, 
	const struct swdev_ops *ops;

	int err = 0;



	if (!(fi->fib_flags & RTNH_F_EXTERNAL))

	if (!(fi->fib_flags & RTNH_F_OFFLOAD))

		return 0;



	dev = netdev_switch_get_dev_by_nhs(fi);
@@ -376,7 +376,7 @@ int netdev_switch_fib_ipv4_del(u32 dst, int dst_len, struct fib_info *fi, 
		err = ops->swdev_fib_ipv4_del(dev, htonl(dst), dst_len,

					      fi, tos, type, tb_id);

		if (!err)

			fi->fib_flags &= ~RTNH_F_EXTERNAL;

			fi->fib_flags &= ~RTNH_F_OFFLOAD;

	}



	return err;