From: Mikko Rapeli <mikko.rapeli@iki.fi>
To: Jonas Gorski <jonas.gorski@gmail.com>
Cc: linux-kernel@vger.kernel.org,
"David S. Miller" <davem@davemloft.net>,
Zhang Shengju <zhangshengju@cmss.chinamobile.com>
Subject: Re: [PATCH] uapi glibc compat: fix outer guard of net device flags enum
Date: Mon, 5 Dec 2016 19:34:02 +0200 [thread overview]
Message-ID: <20161205173401.GU8342@lakka.kapsi.fi> (raw)
In-Reply-To: <1480782705-2638-1-git-send-email-jonas.gorski@gmail.com>
On Sat, Dec 03, 2016 at 05:31:45PM +0100, Jonas Gorski wrote:
> Fix a wrong condition preventing the higher net device flags
> IFF_LOWER_UP etc to be defined if net/if.h is included before
> linux/if.h.
>
> The comment makes it clear the intention was to allow partial
> definition with either parts.
>
> This fixes compilation of userspace programs trying to use
> IFF_LOWER_UP, IFF_DORMANT or IFF_ECHO.
>
> Fixes: 4a91cb61bb99 ("uapi glibc compat: fix compile errors when glibc net/if.h included before linux/if.h")
> Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Reviewed-by: Mikko Rapeli <mikko.rapeli@iki.fi>
Yep, sorry about the logic error. Thanks for the fix!
-Mikko
> ---
> Patch applies cleanly to both linus' HEAD and net-next. I wasn't sure
> which one's the right one.
>
> include/uapi/linux/if.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/include/uapi/linux/if.h b/include/uapi/linux/if.h
> index e601c8c..1158a04 100644
> --- a/include/uapi/linux/if.h
> +++ b/include/uapi/linux/if.h
> @@ -31,7 +31,7 @@
> #include <linux/hdlc/ioctl.h>
>
> /* For glibc compatibility. An empty enum does not compile. */
> -#if __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO != 0 && \
> +#if __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO != 0 || \
> __UAPI_DEF_IF_NET_DEVICE_FLAGS != 0
> /**
> * enum net_device_flags - &struct net_device flags
> @@ -99,7 +99,7 @@ enum net_device_flags {
> IFF_ECHO = 1<<18, /* volatile */
> #endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */
> };
> -#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO != 0 && __UAPI_DEF_IF_NET_DEVICE_FLAGS != 0 */
> +#endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO != 0 || __UAPI_DEF_IF_NET_DEVICE_FLAGS != 0 */
>
> /* for compatibility with glibc net/if.h */
> #if __UAPI_DEF_IF_NET_DEVICE_FLAGS
> --
> 2.1.4
>
next prev parent reply other threads:[~2016-12-05 17:34 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-03 16:31 [PATCH] uapi glibc compat: fix outer guard of net device flags enum Jonas Gorski
2016-12-05 17:34 ` Mikko Rapeli [this message]
2016-12-06 15:44 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161205173401.GU8342@lakka.kapsi.fi \
--to=mikko.rapeli@iki.fi \
--cc=davem@davemloft.net \
--cc=jonas.gorski@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=zhangshengju@cmss.chinamobile.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).