From patchwork Sun Mar 12 22:00:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 737879 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vhFN4583kz9s7F for ; Mon, 13 Mar 2017 09:02:12 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935578AbdCLWBe (ORCPT ); Sun, 12 Mar 2017 18:01:34 -0400 Received: from hauke-m.de ([5.39.93.123]:54876 "EHLO mail.hauke-m.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755784AbdCLWBZ (ORCPT ); Sun, 12 Mar 2017 18:01:25 -0400 Received: from hauke-desktop.lan (p20030086281B7F001E80E46CAF8E5409.dip0.t-ipconnect.de [IPv6:2003:86:281b:7f00:1e80:e46c:af8e:5409]) by mail.hauke-m.de (Postfix) with ESMTPSA id 169C210026D; Sun, 12 Mar 2017 23:01:23 +0100 (CET) From: Hauke Mehrtens To: davem@davemloft.net Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, jarod@redhat.com, jogo@openwrt.org, david.heidelberger@ixit.cz, maillist-linux@barfooze.de, mikko.rapeli@iki.fi, Hauke Mehrtens Subject: [PATCH 2/4] uapi glibc compat: fix build if libc defines IFF_ECHO Date: Sun, 12 Mar 2017 23:00:37 +0100 Message-Id: <20170312220039.16885-3-hauke@hauke-m.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170312220039.16885-1-hauke@hauke-m.de> References: <20170312220039.16885-1-hauke@hauke-m.de> X-Spam-Status: No, score=0.0 required=7.0 tests=UNPARSEABLE_RELAY, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on hauke-m.de Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org musl 1.1.15 defines IFF_ECHO and the other net_device_flags options. When a user application includes linux/if.h and net/if.h the compile will fail. Activate __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO only when it is needed. This should also make this work in case glibc will add these defines. Signed-off-by: Hauke Mehrtens Acked-by: Mikko Rapeli --- include/uapi/linux/libc-compat.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h index 7c1fead03c50..49a8cc3138ae 100644 --- a/include/uapi/linux/libc-compat.h +++ b/include/uapi/linux/libc-compat.h @@ -64,9 +64,11 @@ /* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */ #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 0 /* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ +#ifndef IFF_ECHO #ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 #endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */ +#endif /* IFF_ECHO */ #else /* _NET_IF_H */