diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2023-09-23 11:35:55 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2023-09-23 11:35:55 +0200 |
| commit | 5804c19b80bf625c6a9925317f845e497434d6d3 (patch) | |
| tree | ba4a0bf9cac721e2bf898e3be5ab64773da5a9d2 /include/net | |
| parent | KVM: SVM: Do not use user return MSR support for virtualized TSC_AUX (diff) | |
| parent | KVM: riscv: selftests: Selectively filter-out AIA registers (diff) | |
| download | linux-5804c19b80bf625c6a9925317f845e497434d6d3.tar.xz linux-5804c19b80bf625c6a9925317f845e497434d6d3.zip | |
Merge tag 'kvm-riscv-fixes-6.6-1' of https://github.com/kvm-riscv/linux into HEAD
KVM/riscv fixes for 6.6, take #1
- Fix KVM_GET_REG_LIST API for ISA_EXT registers
- Fix reading ISA_EXT register of a missing extension
- Fix ISA_EXT register handling in get-reg-list test
- Fix filtering of AIA registers in get-reg-list test
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/ipv6.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h index 0675be0f3fa0..c6932d1a3fa8 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h @@ -784,6 +784,11 @@ static inline bool ipv6_addr_v4mapped(const struct in6_addr *a) cpu_to_be32(0x0000ffff))) == 0UL; } +static inline bool ipv6_addr_v4mapped_any(const struct in6_addr *a) +{ + return ipv6_addr_v4mapped(a) && ipv4_is_zeronet(a->s6_addr32[3]); +} + static inline bool ipv6_addr_v4mapped_loopback(const struct in6_addr *a) { return ipv6_addr_v4mapped(a) && ipv4_is_loopback(a->s6_addr32[3]); @@ -1360,7 +1365,7 @@ static inline int __ip6_sock_set_addr_preferences(struct sock *sk, int val) return 0; } -static inline int ip6_sock_set_addr_preferences(struct sock *sk, bool val) +static inline int ip6_sock_set_addr_preferences(struct sock *sk, int val) { int ret; |