ipv4: Rename fib_nh entries

Rename fib_nh entries that will be moved to a fib_nh_common struct.
Specifically, the device, oif, gateway, flags, scope, lwtstate,
nh_weight and nh_upper_bound are common with all nexthop definitions.
In the process shorten fib_nh_lwtstate to fib_nh_lws to avoid really
long lines.

Rename only; no functional change intended.

Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David Ahern
2019-03-27 20:53:55 -07:00
committed by David S. Miller
parent 572bf4dd71
commit b75ed8b1aa
10 changed files with 178 additions and 174 deletions

View File

@@ -63,13 +63,16 @@ TRACE_EVENT(fib_table_lookup,
}
if (nh) {
struct net_device *dev;
p32 = (__be32 *) __entry->saddr;
*p32 = nh->nh_saddr;
p32 = (__be32 *) __entry->gw;
*p32 = nh->nh_gw;
*p32 = nh->fib_nh_gw4;
__assign_str(name, nh->nh_dev ? nh->nh_dev->name : "-");
dev = nh->fib_nh_dev;
__assign_str(name, dev ? dev->name : "-");
} else {
p32 = (__be32 *) __entry->saddr;
*p32 = 0;