From: David Ahern Date: Sun, 22 Nov 2020 19:46:01 +0000 (-0700) Subject: Merge branch 'nexthop-flags' into next X-Git-Tag: v5.11.0~32^2~26 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1ae6efbb8ebec917612f7e71ebfb95ee571e563;p=thirdparty%2Fiproute2.git Merge branch 'nexthop-flags' into next Ido Schimmel says: ==================== From: Ido Schimmel Patch #1 prints the recently added 'RTNH_F_TRAP' flag. Patch #2 makes sure that nexthop flags are always printed for nexthop objects. Even when the nexthop does not have a device, such as a blackhole nexthop or a group. Example output with netdevsim: $ ip nexthop id 1 via 192.0.2.2 dev eth0 scope link trap id 2 blackhole trap id 3 group 2 trap Example output with mlxsw: $ ip nexthop id 1 via 192.0.2.2 dev swp3 scope link offload id 2 blackhole offload id 3 group 2 offload Tested with fib_nexthops.sh that uses "ip nexthop" output: Tests passed: 164 Tests failed: 0 ==================== Signed-off-by: David Ahern --- e1ae6efbb8ebec917612f7e71ebfb95ee571e563