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 <sdf@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/flow_dissector.h b/include/net/flow_dissector.h
index 7c5a8d9a8d2a77eb65d11b5358a4d26a11591bdb..797e19c2fc4054766a3660d94cba250d7bbaf178 100644 (file)
--- a/include/net/flow_dissector.h
+++ b/include/net/flow_dissector.h
@@ -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;

diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
index edd622956083dd01292dc58072884ba2147e8933..c0559af9e5e555d1fc94df513c831f197ceb1633 100644 (file)
--- a/net/core/flow_dissector.c
+++ b/net/core/flow_dissector.c
@@ -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 @@ proto_again:
                __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 @@ proto_again:
                __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):