* [PATCH net-next] net: sched: act_ctinfo: tidy UAPI definition
@ 2019-06-19 17:41 Kevin Darbyshire-Bryant
2019-06-19 21:11 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Kevin Darbyshire-Bryant @ 2019-06-19 17:41 UTC (permalink / raw)
To: netdev; +Cc: Kevin Darbyshire-Bryant
Remove some enums from the UAPI definition that were only used
internally and are NOT part of the UAPI.
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
---
include/net/tc_act/tc_ctinfo.h | 5 +++++
include/uapi/linux/tc_act/tc_ctinfo.h | 5 -----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/net/tc_act/tc_ctinfo.h b/include/net/tc_act/tc_ctinfo.h
index d6a688571672..f071c1d70a25 100644
--- a/include/net/tc_act/tc_ctinfo.h
+++ b/include/net/tc_act/tc_ctinfo.h
@@ -23,6 +23,11 @@ struct tcf_ctinfo {
u64 stats_cpmark_set;
};
+enum {
+ CTINFO_MODE_DSCP = BIT(0),
+ CTINFO_MODE_CPMARK = BIT(1)
+};
+
#define to_ctinfo(a) ((struct tcf_ctinfo *)a)
#endif /* __NET_TC_CTINFO_H */
diff --git a/include/uapi/linux/tc_act/tc_ctinfo.h b/include/uapi/linux/tc_act/tc_ctinfo.h
index 32337304fbe5..f5f26d95d0e7 100644
--- a/include/uapi/linux/tc_act/tc_ctinfo.h
+++ b/include/uapi/linux/tc_act/tc_ctinfo.h
@@ -26,9 +26,4 @@ enum {
#define TCA_CTINFO_MAX (__TCA_CTINFO_MAX - 1)
-enum {
- CTINFO_MODE_DSCP = _BITUL(0),
- CTINFO_MODE_CPMARK = _BITUL(1)
-};
-
#endif
--
2.20.1 (Apple Git-117)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] net: sched: act_ctinfo: tidy UAPI definition
2019-06-19 17:41 [PATCH net-next] net: sched: act_ctinfo: tidy UAPI definition Kevin Darbyshire-Bryant
@ 2019-06-19 21:11 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2019-06-19 21:11 UTC (permalink / raw)
To: ldir; +Cc: netdev
From: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Date: Wed, 19 Jun 2019 18:41:10 +0100
> Remove some enums from the UAPI definition that were only used
> internally and are NOT part of the UAPI.
>
> Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Yeah, this is definitely the right thing to do.
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-06-19 21:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-19 17:41 [PATCH net-next] net: sched: act_ctinfo: tidy UAPI definition Kevin Darbyshire-Bryant
2019-06-19 21:11 ` David Miller
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).