diff options
| author | David S. Miller <davem@davemloft.net> | 2019-09-16 09:18:03 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-09-16 09:18:03 +0200 |
| commit | 95cf66747fc29e6be457e938f89d13e25cea8da3 (patch) | |
| tree | b91a0dfb567b5ed2878d5543014a65196f7fe7ae /include/net/flow_offload.h | |
| parent | 28c9eb9042a954d4e9fbec91484bddce280f1beb (diff) | |
| parent | 470d5060e6b3b8fae47d944601855e9ece7a2470 (diff) | |
| download | kernel_replicant_linux-95cf66747fc29e6be457e938f89d13e25cea8da3.tar.gz kernel_replicant_linux-95cf66747fc29e6be457e938f89d13e25cea8da3.tar.bz2 kernel_replicant_linux-95cf66747fc29e6be457e938f89d13e25cea8da3.zip | |
Merge branch 'More-fixes-for-unlocked-cls-hardware-offload-API-refactoring'
Vlad Buslov says:
====================
More fixes for unlocked cls hardware offload API refactoring
Two fixes for my "Refactor cls hardware offload API to support
rtnl-independent drivers" series and refactoring patch that implements
infrastructure necessary for the fixes.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/flow_offload.h')
| -rw-r--r-- | include/net/flow_offload.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/net/flow_offload.h b/include/net/flow_offload.h index fc881875f856..86c567f531f3 100644 --- a/include/net/flow_offload.h +++ b/include/net/flow_offload.h @@ -154,8 +154,12 @@ enum flow_action_mangle_base { FLOW_ACT_MANGLE_HDR_TYPE_UDP, }; +typedef void (*action_destr)(void *priv); + struct flow_action_entry { enum flow_action_id id; + action_destr destructor; + void *destructor_priv; union { u32 chain_index; /* FLOW_ACTION_GOTO */ struct net_device *dev; /* FLOW_ACTION_REDIRECT */ @@ -170,7 +174,7 @@ struct flow_action_entry { u32 mask; u32 val; } mangle; - const struct ip_tunnel_info *tunnel; /* FLOW_ACTION_TUNNEL_ENCAP */ + struct ip_tunnel_info *tunnel; /* FLOW_ACTION_TUNNEL_ENCAP */ u32 csum_flags; /* FLOW_ACTION_CSUM */ u32 mark; /* FLOW_ACTION_MARK */ u16 ptype; /* FLOW_ACTION_PTYPE */ |