net/sched: act_tunnel_key: add helper inlines to access tcf_tunnel_key

Needed for drivers to pick the relevant action when offloading tunnel
key act.

Signed-off-by: Hadar Hen Zion <hadarh@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/tc_act/tc_tunnel_key.h b/include/net/tc_act/tc_tunnel_key.h
index 253f8da6c2a67a91a9658e980860432224d05f1a..efef0b4b1b2bddc76095bcd4d02ebaaa3b2beb56 100644 (file)
--- a/include/net/tc_act/tc_tunnel_key.h
+++ b/include/net/tc_act/tc_tunnel_key.h
@@ -12,6 +12,8 @@
 #define __NET_TC_TUNNEL_KEY_H
 
 #include <net/act_api.h>
+#include <linux/tc_act/tc_tunnel_key.h>
+#include <net/dst_metadata.h>
 
 struct tcf_tunnel_key_params {
        struct rcu_head         rcu;
@@ -27,4 +29,39 @@ struct tcf_tunnel_key {
 
 #define to_tunnel_key(a) ((struct tcf_tunnel_key *)a)
 
+static inline bool is_tcf_tunnel_set(const struct tc_action *a)
+{
+#ifdef CONFIG_NET_CLS_ACT
+       struct tcf_tunnel_key *t = to_tunnel_key(a);
+       struct tcf_tunnel_key_params *params = rtnl_dereference(t->params);
+
+       if (a->ops && a->ops->type == TCA_ACT_TUNNEL_KEY)
+               return params->tcft_action == TCA_TUNNEL_KEY_ACT_SET;
+#endif
+       return false;
+}
+
+static inline bool is_tcf_tunnel_release(const struct tc_action *a)
+{
+#ifdef CONFIG_NET_CLS_ACT
+       struct tcf_tunnel_key *t = to_tunnel_key(a);
+       struct tcf_tunnel_key_params *params = rtnl_dereference(t->params);
+
+       if (a->ops && a->ops->type == TCA_ACT_TUNNEL_KEY)
+               return params->tcft_action == TCA_TUNNEL_KEY_ACT_RELEASE;
+#endif
+       return false;
+}
+
+static inline struct ip_tunnel_info *tcf_tunnel_info(const struct tc_action *a)
+{
+#ifdef CONFIG_NET_CLS_ACT
+       struct tcf_tunnel_key *t = to_tunnel_key(a);
+       struct tcf_tunnel_key_params *params = rtnl_dereference(t->params);
+
+       return &params->tcft_enc_metadata->u.tun_info;
+#else
+       return NULL;
+#endif
+}
 #endif /* __NET_TC_TUNNEL_KEY_H */

diff --git a/net/sched/act_tunnel_key.c b/net/sched/act_tunnel_key.c
index af47bdf2f4831541fce2e2adc3d7b14eab9bcf19..cab1fd5712d7dd74c01e49d2adcc2a0dcd1baccb 100644 (file)
--- a/net/sched/act_tunnel_key.c
+++ b/net/sched/act_tunnel_key.c
@@ -16,7 +16,6 @@
 #include <net/netlink.h>
 #include <net/pkt_sched.h>
 #include <net/dst.h>
-#include <net/dst_metadata.h>
 
 #include <linux/tc_act/tc_tunnel_key.h>
 #include <net/tc_act/tc_tunnel_key.h>