Benjamin Poirier 5b3beff4e8 ipv6: Fix route replacement with dev-only route ... [ Upstream commit e404b8c7cf ] After commit 2759647247 ("ipv6: fix ECMP route replacement") it is no longer possible to replace an ECMP-able route by a non ECMP-able route. For example, ip route add 2001:db8::1/128 via fe80::1 dev dummy0 ip route replace 2001:db8::1/128 dev dummy0 does not work as expected. Tweak the replacement logic so that point 3 in the log of the above commit becomes: 3. If the new route is not ECMP-able, and no matching non-ECMP-able route exists, replace matching ECMP-able route (if any) or add the new route. We can now summarize the entire replace semantics to: When doing a replace, prefer replacing a matching route of the same "ECMP-able-ness" as the replace argument. If there is no such candidate, fallback to the first route found. Fixes: 2759647247 ("ipv6: fix ECMP route replacement") Signed-off-by: Benjamin Poirier <bpoirier@cumulusnetworks.com> Reviewed-by: Michal Kubecek <mkubecek@suse.cz> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2020-03-05 16:43:35 +01:00
..
6lowpan
9p	9p pull request for inclusion in 5.4	2019-09-27 15:10:34 -07:00
802
8021q	vlan: vlan_changelink() should propagate errors	2020-01-12 12:21:50 +01:00
appletalk	appletalk: enforce CAP_NET_RAW for raw sockets	2019-09-24 16:37:18 +02:00
atm	net: atm: Reduce the severity of logging in unlink_clip_vcc	2019-11-18 17:08:20 -08:00
ax25	ax25: enforce CAP_NET_RAW for raw sockets	2019-09-24 16:37:18 +02:00
batman-adv	batman-adv: Fix DAT candidate selection on little endian systems	2020-01-23 08:22:49 +01:00
bluetooth	Bluetooth: Fix race condition in hci_release_sock()	2020-02-05 21:22:42 +00:00
bpf	bpf/flow_dissector: support flags in BPF_PROG_TEST_RUN	2019-07-25 18:00:41 -07:00
bpfilter	Kbuild updates for v5.3	2019-07-12 16:03:16 -07:00
bridge	net: add bool confirm_neigh parameter for dst_ops.update_pmtu	2020-01-04 19:18:58 +01:00
caif	net: use skb_queue_empty_lockless() in poll() handlers	2019-10-28 13:33:41 -07:00
can	can: j1939: j1939_sk_bind(): take priv after lock is held	2019-12-31 16:45:56 +01:00
ceph	libceph: use ceph_kvmalloc() for osdmap arrays	2019-09-16 12:06:25 +02:00
core	net: export netdev_next_lower_dev_rcu()	2020-03-05 16:43:35 +01:00
dcb
dccp	net: ipv6: add net argument to ip6_dst_lookup_flow	2019-12-18 16:08:40 +01:00
decnet	net: add bool confirm_neigh parameter for dst_ops.update_pmtu	2020-01-04 19:18:58 +01:00
dns_resolver	Revert "Merge tag 'keys-acl-20190703' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs"	2019-07-10 18:43:43 -07:00
dsa	net: dsa: tag_qca: Make sure there is headroom for tag	2020-02-24 08:36:22 +01:00
ethernet	net: add annotations on hh->hh_len lockless accesses	2020-01-09 10:20:06 +01:00
hsr	net: hsr: fix possible NULL deref in hsr_handle_frame()	2020-02-11 04:35:04 -08:00
ieee802154	net: core: add generic lockdep keys	2019-10-24 14:53:48 -07:00
ife	net: Fix Kconfig indentation	2019-09-26 08:56:17 +02:00
ipv4	udp: rehash on disconnect	2020-03-05 16:43:33 +01:00
ipv6	ipv6: Fix route replacement with dev-only route	2020-03-05 16:43:35 +01:00
iucv	net/af_iucv: mark expected switch fall-throughs	2019-07-29 10:26:14 -07:00
kcm	kcm: disable preemption in kcm_parse_func_strparser()	2019-09-27 10:27:14 +02:00
key	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-07-08 19:48:57 -07:00
l2tp	l2tp: Allow duplicate session creation with UDP	2020-02-11 04:35:04 -08:00
l3mdev
lapb
llc	llc2: Fix return statement of llc_stat_ev_rx_null_dsap_xid_c (and _test_c)	2020-01-12 12:21:45 +01:00
mac80211	mac80211: fix quiet mode activation in action frames	2020-02-19 19:53:08 +01:00
mac802154
mpls	net: ipv6_stub: use ip6_dst_lookup_flow instead of ip6_dst_lookup	2019-12-18 16:08:42 +01:00
ncsi	net/ncsi: Disable global multicast filter	2019-09-19 18:04:40 -07:00
netfilter	netfilter: xt_hashlimit: limit the max size of hashtable	2020-02-28 17:22:27 +01:00
netlabel	netlabel: remove redundant assignment to pointer iter	2019-09-01 11:45:02 -07:00
netlink
netrom	net: core: add generic lockdep keys	2019-10-24 14:53:48 -07:00
nfc	net: nfc: nci: fix a possible sleep-in-atomic-context bug in nci_uart_tty_receive()	2019-12-31 16:41:23 +01:00
nsh
openvswitch	net: openvswitch: don't unlock mutex when changing the user_features fails	2020-01-26 10:01:05 +01:00
packet	packet: fix data-race in fanout_flow_is_huge()	2020-01-26 10:01:06 +01:00
phonet	net: use skb_queue_empty_lockless() in poll() handlers	2019-10-28 13:33:41 -07:00
psample	net: psample: fix skb_over_panic	2019-12-04 22:30:54 +01:00
qrtr	net: qrtr: Stop rx_worker before freeing node	2019-09-21 18:45:46 -07:00
rds	rds: ib: update WR sizes when bringing up connection	2019-11-16 12:59:08 -08:00
rfkill	rfkill: Fix incorrect check to avoid NULL pointer dereference	2020-01-12 12:21:33 +01:00
rose	net: core: add generic lockdep keys	2019-10-24 14:53:48 -07:00
rxrpc	rxrpc: Fix call RCU cleanup using non-bh-safe locks	2020-02-28 17:22:27 +01:00
sched	net: sched: correct flower port blocking	2020-03-05 16:43:32 +01:00
sctp	sctp: move the format error check out of __sctp_sf_do_9_1_abort	2020-03-05 16:43:34 +01:00
smc	net/smc: fix leak of kernel memory to user space	2020-02-24 08:36:21 +01:00
strparser
sunrpc	sunrpc: Fix potential leaks in sunrpc_cache_unhash()	2020-02-24 08:36:55 +01:00
switchdev
tipc	tipc: fix wrong timeout input for tipc_wait_for_cond()	2020-01-26 10:01:00 +01:00
tls	net/tls: Fix to avoid gettig invalid tls record	2020-03-05 16:43:32 +01:00
unix	af_unix: add compat_ioctl support	2020-01-17 19:48:52 +01:00
vmw_vsock	hv_sock: Remove the accept port restriction	2020-02-14 16:34:07 -05:00
wimax	wimax: no need to check return value of debugfs_create functions	2019-08-10 15:25:47 -07:00
wireless	wireless: wext: avoid gcc -O3 warning	2020-02-05 21:22:47 +00:00
x25	net/x25: fix nonblocking connect	2020-01-29 16:45:33 +01:00
xdp	xsk: Add rcu_read_lock around the XSK wakeup	2020-01-12 12:21:41 +01:00
xfrm	xfrm: interface: do not confirm neighbor when do pmtu update	2020-02-05 21:22:48 +00:00
compat.c
Kconfig	devlink: Add packet trap infrastructure	2019-08-17 12:40:08 -07:00
Makefile
socket.c	compat_ioctl: handle SIOCOUTQNSD	2020-01-17 19:48:52 +01:00
sysctl_net.c