Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-17 17:41:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

flow_dissector: remove unused FLOW_DISSECTOR_F_STOP_AT_L3 flag

Browse Source 
This flag is not used by any caller, remove it.

Signed-off-by: Stanislav Fomichev <sdf@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Stanislav Fomichev 2019-05-31 14:05:06 -07:00 committed by David S. Miller
parent 6c018b738a
commit 1cc26450a8
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/net/flow_dissector.h
View File

@ -229,9 +229,8 @@ enum flow_dissector_key_id {
}; };
#define FLOW_DISSECTOR_F_PARSE_1ST_FRAG BIT(0) #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(1)
#define FLOW_DISSECTOR_F_STOP_AT_FLOW_LABEL BIT(2) #define FLOW_DISSECTOR_F_STOP_AT_ENCAP BIT(2)
#define FLOW_DISSECTOR_F_STOP_AT_ENCAP BIT(3)
struct flow_dissector_key { struct flow_dissector_key {
enum flow_dissector_key_id key_id; enum flow_dissector_key_id key_id;

10
net/core/flow_dissector.c
View File

@ -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) * @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) * @hlen: packet header length, if @data is NULL use skb_headlen(skb)
* @flags: flags that control the dissection process, e.g. * @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 * 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 * by flow_dissector from either the skbuff or a raw buffer specified by the
@ -922,11 +922,6 @@ proto_again:
__skb_flow_dissect_ipv4(skb, flow_dissector, __skb_flow_dissect_ipv4(skb, flow_dissector,
target_container, data, iph); target_container, data, iph);
if (flags & FLOW_DISSECTOR_F_STOP_AT_L3) {
fdret = FLOW_DISSECT_RET_OUT_GOOD;
break;
}
break; break;
} }
case htons(ETH_P_IPV6): { case htons(ETH_P_IPV6): {
@ -975,9 +970,6 @@ proto_again:
__skb_flow_dissect_ipv6(skb, flow_dissector, __skb_flow_dissect_ipv6(skb, flow_dissector,
target_container, data, iph); target_container, data, iph);
if (flags & FLOW_DISSECTOR_F_STOP_AT_L3)
fdret = FLOW_DISSECT_RET_OUT_GOOD;
break; break;
} }
case htons(ETH_P_8021AD): case htons(ETH_P_8021AD):