1
0
mirror of https://github.com/systemd/systemd synced 2025-09-28 16:24:45 +02:00

Compare commits

..

2 Commits

Author SHA1 Message Date
Yu Watanabe
aac6673f02 network: address-pool: also check conflicts with foreign addresses
Fixes CI issue found in
https://github.com/systemd/systemd-centos-ci/pull/334.
2021-01-17 23:23:08 +00:00
Jonathan McDowell
0da7f9e589
hwdb: Add NEWYES 10" LCD writing tablet (#18274) 2021-01-18 08:39:07 +10:00
2 changed files with 18 additions and 0 deletions

View File

@ -559,6 +559,15 @@ evdev:name:MSFT0001:02 04F3:304B Touchpad:dmi:*svnLENOVO:*pvrLenovoLegionY9000X2
EVDEV_ABS_35=::31 EVDEV_ABS_35=::31
EVDEV_ABS_36=::30 EVDEV_ABS_36=::30
#########################################
# NEWYES
#########################################
# NEWYES 10" LCD writing tablet
evdev:input:b0003v6161p4D15*
EVDEV_ABS_00=::152
EVDEV_ABS_01=::244
######################################### #########################################
# Razer # Razer
######################################### #########################################

View File

@ -107,6 +107,15 @@ static bool address_pool_prefix_is_taken(
return true; return true;
} }
/* Don't clash with assigned foreign addresses */
SET_FOREACH(a, l->addresses_foreign) {
if (a->family != p->family)
continue;
if (in_addr_prefix_intersect(p->family, u, prefixlen, &a->in_addr, a->prefixlen))
return true;
}
/* Don't clash with addresses already pulled from the pool, but not assigned yet */ /* Don't clash with addresses already pulled from the pool, but not assigned yet */
SET_FOREACH(a, l->pool_addresses) { SET_FOREACH(a, l->pool_addresses) {
if (a->family != p->family) if (a->family != p->family)