diff options
| author | Amir Vadai <amir@vadai.me> | 2016-03-08 05:42:31 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-03-10 16:24:02 -0500 |
| commit | 00175aec941e9c306d8a5ce930b2d91f7c04468c (patch) | |
| tree | d269c99cb155b40765f5687154098063e72f56ae /include/net/tc_act | |
| parent | 8de2d793daf784f8f109565bcc023a6d198bad85 (diff) | |
net/sched: Macro instead of CONFIG_NET_CLS_ACT ifdef
Introduce the macros tc_no_actions and tc_for_each_action to make code
clearer.
Extracted struct tc_action out of the ifdef to make calls to
is_tcf_gact_shot() and similar functions valid, even when it is a nop.
Acked-by: Jiri Pirko <jiri@mellanox.com>
Acked-by: John Fastabend <john.r.fastabend@intel.com>
Suggested-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Amir Vadai <amir@vadai.me>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/tc_act')
| -rw-r--r-- | include/net/tc_act/tc_gact.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/tc_act/tc_gact.h b/include/net/tc_act/tc_gact.h index 04a31830711b..93c520b83d10 100644 --- a/include/net/tc_act/tc_gact.h +++ b/include/net/tc_act/tc_gact.h | |||
| @@ -16,9 +16,9 @@ struct tcf_gact { | |||
| 16 | #define to_gact(a) \ | 16 | #define to_gact(a) \ |
| 17 | container_of(a->priv, struct tcf_gact, common) | 17 | container_of(a->priv, struct tcf_gact, common) |
| 18 | 18 | ||
| 19 | #ifdef CONFIG_NET_CLS_ACT | ||
| 20 | static inline bool is_tcf_gact_shot(const struct tc_action *a) | 19 | static inline bool is_tcf_gact_shot(const struct tc_action *a) |
| 21 | { | 20 | { |
| 21 | #ifdef CONFIG_NET_CLS_ACT | ||
| 22 | struct tcf_gact *gact; | 22 | struct tcf_gact *gact; |
| 23 | 23 | ||
| 24 | if (a->ops && a->ops->type != TCA_ACT_GACT) | 24 | if (a->ops && a->ops->type != TCA_ACT_GACT) |
| @@ -28,7 +28,7 @@ static inline bool is_tcf_gact_shot(const struct tc_action *a) | |||
| 28 | if (gact->tcf_action == TC_ACT_SHOT) | 28 | if (gact->tcf_action == TC_ACT_SHOT) |
| 29 | return true; | 29 | return true; |
| 30 | 30 | ||
| 31 | #endif | ||
| 31 | return false; | 32 | return false; |
| 32 | } | 33 | } |
| 33 | #endif | ||
| 34 | #endif /* __NET_TC_GACT_H */ | 34 | #endif /* __NET_TC_GACT_H */ |
