From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leon Romanovsky Subject: [PATCH iproute2] ip: Fix compilation break on old systems Date: Mon, 13 Nov 2017 12:21:19 +0200 Message-ID: <20171113102119.11687-1-leon@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: netdev@vger.kernel.org, Leon Romanovsky , Cong Wang , Riad Abo Raed To: Stephen Hemminger Return-path: Received: from mail.kernel.org ([198.145.29.99]:38538 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752397AbdKMKVX (ORCPT ); Mon, 13 Nov 2017 05:21:23 -0500 Sender: netdev-owner@vger.kernel.org List-ID: From: Leon Romanovsky As was reported [1], the iproute2 fails to compile on old systems, in Cong's case, it was Fedora 19, in our case it was RedHat 7.2, which failed with the following errors during compilation: ipxfrm.c: In function ‘xfrm_selector_print’: ipxfrm.c:479:7: error: ‘IPPROTO_MH’ undeclared (first use in this function) case IPPROTO_MH: ^ ipxfrm.c:479:7: note: each undeclared identifier is reported only once for each function it appears in ipxfrm.c: In function ‘xfrm_selector_upspec_parse’: ipxfrm.c:1345:8: error: ‘IPPROTO_MH’ undeclared (first use in this function) case IPPROTO_MH: ^ make[1]: *** [ipxfrm.o] Error 1 The reason to it is the order of headers files. The IPPROTO_MH field is set in kernel's UAPI header file (in6.h), but only in case __UAPI_DEF_IPPROTO_V6 is set before. That define comes from other kernel's header file (libc-compat.h) and is set in case there are no previous libc relevant declarations. In ip code, the include of causes to indirect inclusion of and it sets __UAPI_DEF_IPPROTO_V6 to be zero and prevents from IPPROTO_MH declaration. This patch takes the simplest possible approach to fix the compilation error by checking if IPPROTO_MH was defined before and in case it wasn't, it defines it to be the same as in the kernel. [1] https://www.spinics.net/lists/netdev/msg463980.html Cc: Cong Wang Cc: Riad Abo Raed Signed-off-by: Leon Romanovsky --- ip/xfrm.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ip/xfrm.h b/ip/xfrm.h index 8566d639..71be574d 100644 --- a/ip/xfrm.h +++ b/ip/xfrm.h @@ -30,6 +30,10 @@ #include #include +#ifndef IPPROTO_MH +#define IPPROTO_MH 135 +#endif + #define XFRMS_RTA(x) ((struct rtattr*)(((char*)(x)) + NLMSG_ALIGN(sizeof(struct xfrm_usersa_info)))) #define XFRMS_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct xfrm_usersa_info))