flow_dissector: remove unused FLOW_DISSECTOR_F_STOP_AT_L3 flag
Subsystems (2)
PATCH 1/1 flow_dissector: remove unused FLOW_DISSECTOR_F_STOP_AT_L3 flag
This flag is not used by any caller, remove it.
Signed-off-by Stanislav Fomichev <[email protected]>
--- include/net/flow_dissector.h | 5 ++--- net/core/flow_dissector.c | 10 +--------- 2 files changed, 3 insertions(+), 12 deletions(-)
include/net/flow_dissector.h +2 -3
@@ -229,9 +229,8 @@ enum flow_dissector_key_id { };#define FLOW_DISSECTOR_F_PARSE_1ST_FRAG BIT(0) -#define FLOW_DISSECTOR_F_STOP_AT_L3 BIT(1) -#define FLOW_DISSECTOR_F_STOP_AT_FLOW_LABEL BIT(2) -#define FLOW_DISSECTOR_F_STOP_AT_ENCAP BIT(3) +#define FLOW_DISSECTOR_F_STOP_AT_FLOW_LABEL BIT(1) +#define FLOW_DISSECTOR_F_STOP_AT_ENCAP BIT(2)struct flow_dissector_key {enum flow_dissector_key_id key_id;
net/core/flow_dissector.c +1 -9
@@ -757,7 +757,7 @@ bool bpf_flow_dissect(struct bpf_prog *prog, struct bpf_flow_dissector *ctx,* @nhoff: network header offset, if @data is NULL use skb_network_offset(skb) * @hlen: packet header length, if @data is NULL use skb_headlen(skb) * @flags: flags that control the dissection process, e.g. -* FLOW_DISSECTOR_F_STOP_AT_L3. +* FLOW_DISSECTOR_F_STOP_AT_ENCAP. * * The function will try to retrieve individual keys into target specified * by flow_dissector from either the skbuff or a raw buffer specified by the
@@ -922,11 +922,6 @@ bool __skb_flow_dissect(const struct net *net,__skb_flow_dissect_ipv4 (skb, flow_dissector, target_container, data, iph); -if (flags &FLOW_DISSECTOR_F_STOP_AT_L3 ) { - fdret =FLOW_DISSECT_RET_OUT_GOOD ; -break ; - } -break ; }case htons (ETH_P_IPV6 ): {
@@ -975,9 +970,6 @@ bool __skb_flow_dissect(const struct net *net,__skb_flow_dissect_ipv6 (skb, flow_dissector, target_container, data, iph); -if (flags &FLOW_DISSECTOR_F_STOP_AT_L3 ) - fdret =FLOW_DISSECT_RET_OUT_GOOD ; -break ; }case htons (ETH_P_8021AD ):
Signature · 1 line
2.22.0.rc1.257.g3120a18244-goog
From: Stanislav Fomichev <[email protected]>
Date: Fri, 31 May 2019 14:05:06 -0700
Quoted 3 lines
This flag is not used by any caller, remove it.
Signed-off-by Stanislav Fomichev <[email protected]>
Applied.