From dfc1e2f92afc28d3d2326fd0893603a9014bccac Mon Sep 17 00:00:00 2001 From: Will McVicker Date: Wed, 29 Apr 2020 15:24:23 -0700 Subject: [PATCH] Revert "ANDROID: GKI: ipv4: increase __IPV4_DEVCONF_MAX to 64" This reverts commit 5071be2967b67f4aa2568c625f92902645ebccca. We would rather fill in vendor padding vs specify a max value. Signed-off-by: Will McVicker Bug: 154377500 Change-Id: If0376b2b46d0f811c8d02eb05096bf00c204d54f --- include/uapi/linux/ip.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/uapi/linux/ip.h b/include/uapi/linux/ip.h index c75a94ae7b02..e42d13b55cf3 100644 --- a/include/uapi/linux/ip.h +++ b/include/uapi/linux/ip.h @@ -169,8 +169,7 @@ enum IPV4_DEVCONF_DROP_UNICAST_IN_L2_MULTICAST, IPV4_DEVCONF_DROP_GRATUITOUS_ARP, IPV4_DEVCONF_BC_FORWARDING, - /* Add extra padding for vendor modifications */ - __IPV4_DEVCONF_MAX=64 + __IPV4_DEVCONF_MAX }; #define IPV4_DEVCONF_MAX (__IPV4_DEVCONF_MAX - 1)