Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 1 | Content-Type: text/plain; charset="utf-8" |
| 2 | MIME-Version: 1.0 |
| 3 | Content-Transfer-Encoding: 7bit |
| 4 | Subject: [v2,2/3] uapi glibc compat: fix build if libc defines IFF_ECHO |
| 5 | From: Hauke Mehrtens <hauke@hauke-m.de> |
| 6 | X-Patchwork-Id: 9686293 |
| 7 | Message-Id: <20170418210036.26039-3-hauke@hauke-m.de> |
| 8 | To: davem@davemloft.net, netdev@vger.kernel.org |
| 9 | Cc: linux-kernel@vger.kernel.org, jarod@redhat.com, jogo@openwrt.org, |
| 10 | david.heidelberger@ixit.cz, maillist-linux@barfooze.de, |
| 11 | mikko.rapeli@iki.fi, dwmw2@infradead.org, Hauke Mehrtens <hauke@hauke-m.de> |
| 12 | Date: Tue, 18 Apr 2017 23:00:35 +0200 |
| 13 | |
| 14 | musl 1.1.15 defines IFF_ECHO and the other net_device_flags options. |
| 15 | When a user application includes linux/if.h and net/if.h the compile |
| 16 | will fail. |
| 17 | |
| 18 | Activate __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO only when |
| 19 | it is needed. This should also make this work in case glibc will add |
| 20 | these defines. |
| 21 | |
| 22 | Acked-by: Mikko Rapeli <mikko.rapeli@iki.fi> |
| 23 | Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> |
| 24 | --- |
| 25 | Upstream-Status: Submitted [https://patchwork.kernel.org/patch/9686293/] |
| 26 | Signed-off-by: André Draszik <adraszik@tycoint.com> |
| 27 | Acked-by: Stephane Ayotte <sayotte@tycoint.com> |
| 28 | include/uapi/linux/libc-compat.h | 2 ++ |
| 29 | 1 file changed, 2 insertions(+) |
| 30 | |
| 31 | diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h |
| 32 | index 43a81136ea6e..ce2fa8a4ced6 100644 |
| 33 | --- a/include/uapi/linux/libc-compat.h |
| 34 | +++ b/include/uapi/linux/libc-compat.h |
| 35 | @@ -64,9 +64,11 @@ |
| 36 | /* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */ |
| 37 | #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 0 |
| 38 | /* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ |
| 39 | +#ifndef IFF_ECHO |
| 40 | #ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO |
| 41 | #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 |
| 42 | #endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */ |
| 43 | +#endif /* IFF_ECHO */ |
| 44 | |
| 45 | #else /* _NET_IF_H */ |
| 46 | |