2020-03-24 04:20:01

by Eugene Syromiatnikov

Subject: [PATCH net-next] taprio: do not use BIT() in TCA_TAPRIO_ATTR_FLAG_* definitions

BIT() macro definition is internal to the Linux kernel and is not
to be used in UAPI headers; replace its usage with the _BITUL() macro
that is already used elsewhere in the header.

Cc: <[email protected]> # v5.4+
Fixes: 9c66d1564676 ("taprio: Add support for hardware offloading")
Signed-off-by: Eugene Syromiatnikov <[email protected]>
---
include/uapi/linux/pkt_sched.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/uapi/linux/pkt_sched.h b/include/uapi/linux/pkt_sched.h
index bbe791b..0e43f67 100644
--- a/include/uapi/linux/pkt_sched.h
+++ b/include/uapi/linux/pkt_sched.h
@@ -1197,8 +1197,8 @@ enum {
* [TCA_TAPRIO_ATTR_SCHED_ENTRY_INTERVAL]
*/

-#define TCA_TAPRIO_ATTR_FLAG_TXTIME_ASSIST BIT(0)
-#define TCA_TAPRIO_ATTR_FLAG_FULL_OFFLOAD BIT(1)
+#define TCA_TAPRIO_ATTR_FLAG_TXTIME_ASSIST _BITUL(0)
+#define TCA_TAPRIO_ATTR_FLAG_FULL_OFFLOAD _BITUL(1)

enum {
TCA_TAPRIO_ATTR_UNSPEC,
--
2.1.4

2020-03-24 08:57:00

by Vladimir Oltean

Subject: Re: [PATCH net-next] taprio: do not use BIT() in TCA_TAPRIO_ATTR_FLAG_* definitions

Hi Eugene,

On Tue, 24 Mar 2020 at 06:19, Eugene Syromiatnikov <[email protected]> wrote:
>
> BIT() macro definition is internal to the Linux kernel and is not
> to be used in UAPI headers; replace its usage with the _BITUL() macro
> that is already used elsewhere in the header.
>
> Cc: <[email protected]> # v5.4+
> Fixes: 9c66d1564676 ("taprio: Add support for hardware offloading")
> Signed-off-by: Eugene Syromiatnikov <[email protected]>
> ---

I see this mirrors what was done in commit

commit 9903c8dc734265689d5770ff28c84a7228fe5890
Author: Vedang Patel <[email protected]>
Date: Tue Jun 25 15:07:13 2019 -0700

etf: Don't use BIT() in UAPI headers.

The BIT() macro isn't exported as part of the UAPI interface. So, the
compile-test to ensure they are self contained fails. So, use _BITUL()
instead.

Signed-off-by: Vedang Patel <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

so

Acked-by: Vladimir Oltean <[email protected]>

> include/uapi/linux/pkt_sched.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/include/uapi/linux/pkt_sched.h b/include/uapi/linux/pkt_sched.h
> index bbe791b..0e43f67 100644
> --- a/include/uapi/linux/pkt_sched.h
> +++ b/include/uapi/linux/pkt_sched.h
> @@ -1197,8 +1197,8 @@ enum {
> * [TCA_TAPRIO_ATTR_SCHED_ENTRY_INTERVAL]
> */
>
> -#define TCA_TAPRIO_ATTR_FLAG_TXTIME_ASSIST BIT(0)
> -#define TCA_TAPRIO_ATTR_FLAG_FULL_OFFLOAD BIT(1)
> +#define TCA_TAPRIO_ATTR_FLAG_TXTIME_ASSIST _BITUL(0)
> +#define TCA_TAPRIO_ATTR_FLAG_FULL_OFFLOAD _BITUL(1)
>
> enum {
> TCA_TAPRIO_ATTR_UNSPEC,
> --
> 2.1.4
>

Regards,
-Vladimir

2020-03-27 03:10:33

by David Miller

Subject: Re: [PATCH net-next] taprio: do not use BIT() in TCA_TAPRIO_ATTR_FLAG_* definitions

From: Eugene Syromiatnikov <[email protected]>
Date: Tue, 24 Mar 2020 05:19:20 +0100

> BIT() macro definition is internal to the Linux kernel and is not
> to be used in UAPI headers; replace its usage with the _BITUL() macro
> that is already used elsewhere in the header.
>
> Cc: <[email protected]> # v5.4+
> Fixes: 9c66d1564676 ("taprio: Add support for hardware offloading")
> Signed-off-by: Eugene Syromiatnikov <[email protected]>

Applied.