diff options
| author | Amir Vadai <amir@vadai.me> | 2016-03-08 11:42:31 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-03-10 22:24:02 +0100 |
| commit | 00175aec941e9c306d8a5ce930b2d91f7c04468c (patch) | |
| tree | d269c99cb155b40765f5687154098063e72f56ae /include/net/tc_act | |
| parent | net/flow_dissector: Make dissector_uses_key() and skb_flow_dissector_target()... (diff) | |
| download | linux-00175aec941e9c306d8a5ce930b2d91f7c04468c.tar.xz linux-00175aec941e9c306d8a5ce930b2d91f7c04468c.zip | |
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 { #define to_gact(a) \ container_of(a->priv, struct tcf_gact, common) -#ifdef CONFIG_NET_CLS_ACT static inline bool is_tcf_gact_shot(const struct tc_action *a) { +#ifdef CONFIG_NET_CLS_ACT struct tcf_gact *gact; 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) if (gact->tcf_action == TC_ACT_SHOT) return true; +#endif return false; } -#endif #endif /* __NET_TC_GACT_H */ |