From 18dcace71e4e58510035978dada58c4915d9f2d8 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 14 Jun 2023 20:04:57 +0000 Subject: [PATCH] Revert "net/ipv6: fix bool/int mismatch for skip_notify_on_dev_down" This reverts commit 76e38e6e1b35e9ae845a353dbcb3282af768a85a. It breaks the Android KABI and will be brought back at a later time when it is safe to do so. Bug: 161946584 Change-Id: I7d9e90dde9c6fada5013550a7673bf378f3fadcb Signed-off-by: Greg Kroah-Hartman --- include/net/netns/ipv6.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h index 3764ac0cf1b5..9020f07cae92 100644 --- a/include/net/netns/ipv6.h +++ b/include/net/netns/ipv6.h @@ -54,7 +54,7 @@ struct netns_sysctl_ipv6 { int seg6_flowlabel; u32 ioam6_id; u64 ioam6_id_wide; - int skip_notify_on_dev_down; + bool skip_notify_on_dev_down; u8 fib_notify_on_flag_change; ANDROID_KABI_RESERVE(1); };