From: David S. Miller Date: Fri, 1 Apr 2022 11:09:17 +0000 (+0100) Subject: Merge branch 'nexthop-route-deletye-warning' X-Git-Tag: v6.1-rc5~1602^2~29 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=37391cc843eb7a302eed289b3ad745863d2af470;p=platform%2Fkernel%2Flinux-starfive.git Merge branch 'nexthop-route-deletye-warning' Nikolay Aleksandrov says: ==================== net: ipv4: fix nexthop route delete warning The first patch fixes a warning that can be triggered by deleting a nexthop route and specifying a device (more info in its commit msg). And the second patch adds a selftest for that case. Chose this way to fix it because we should match when deleting without nh spec and should fail when deleting a nexthop route with old-style nh spec because nexthop objects are managed separately, e.g.: $ ip r show 1.2.3.4/32 1.2.3.4 nhid 12 via 192.168.11.2 dev dummy0 $ ip r del 1.2.3.4/32 $ ip r del 1.2.3.4/32 nhid 12 $ ip r del 1.2.3.4/32 dev dummy0 v2: addded more to patch 01's commit message adjusted the test comment in patch 02 ==================== Signed-off-by: David S. Miller --- 37391cc843eb7a302eed289b3ad745863d2af470