flow_dissector: Dissect tos and ttl from the tunnel info

[sfrench/cifs-2.6.git] / net / core / flow_dissector.c

diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
index 53f96e4f7bf593863b584e050eb7628d4023718a..08a5184f4b344281ed1c458aa62a3033e63a81e5 100644 (file)
--- a/net/core/flow_dissector.c
+++ b/net/core/flow_dissector.c
@@ -152,7 +152,9 @@ skb_flow_dissect_tunnel_info(const struct sk_buff *skb,
            !dissector_uses_key(flow_dissector,
                                FLOW_DISSECTOR_KEY_ENC_CONTROL) &&
            !dissector_uses_key(flow_dissector,
-                               FLOW_DISSECTOR_KEY_ENC_PORTS))
+                               FLOW_DISSECTOR_KEY_ENC_PORTS) &&
+           !dissector_uses_key(flow_dissector,
+                               FLOW_DISSECTOR_KEY_ENC_IP))
                return;
 
        info = skb_tunnel_info(skb);
@@ -212,6 +214,16 @@ skb_flow_dissect_tunnel_info(const struct sk_buff *skb,
                tp->src = key->tp_src;
                tp->dst = key->tp_dst;
        }
+
+       if (dissector_uses_key(flow_dissector, FLOW_DISSECTOR_KEY_ENC_IP)) {
+               struct flow_dissector_key_ip *ip;
+
+               ip = skb_flow_dissector_target(flow_dissector,
+                                              FLOW_DISSECTOR_KEY_ENC_IP,
+                                              target_container);
+               ip->tos = key->tos;
+               ip->ttl = key->ttl;
+       }
 }
 EXPORT_SYMBOL(skb_flow_dissect_tunnel_info);
 
@@ -589,7 +601,7 @@ bool __skb_flow_dissect(const struct sk_buff *skb,
        struct flow_dissector_key_tags *key_tags;
        struct flow_dissector_key_vlan *key_vlan;
        enum flow_dissect_ret fdret;
-       bool skip_vlan = false;
+       enum flow_dissector_key_id dissector_vlan = FLOW_DISSECTOR_KEY_MAX;
        int num_hdrs = 0;
        u8 ip_proto = 0;
        bool ret;
@@ -748,14 +760,14 @@ proto_again:
        }
        case htons(ETH_P_8021AD):
        case htons(ETH_P_8021Q): {
-               const struct vlan_hdr *vlan;
+               const struct vlan_hdr *vlan = NULL;
                struct vlan_hdr _vlan;
-               bool vlan_tag_present = skb && skb_vlan_tag_present(skb);
+               __be16 saved_vlan_tpid = proto;
 
-               if (vlan_tag_present)
+               if (dissector_vlan == FLOW_DISSECTOR_KEY_MAX &&
+                   skb && skb_vlan_tag_present(skb)) {
                        proto = skb->protocol;
-
-               if (!vlan_tag_present || eth_type_vlan(skb->protocol)) {
+               } else {
                        vlan = __skb_header_pointer(skb, nhoff, sizeof(_vlan),
                                                    data, hlen, &_vlan);
                        if (!vlan) {
@@ -765,20 +777,23 @@ proto_again:
 
                        proto = vlan->h_vlan_encapsulated_proto;
                        nhoff += sizeof(*vlan);
-                       if (skip_vlan) {
-                               fdret = FLOW_DISSECT_RET_PROTO_AGAIN;
-                               break;
-                       }
                }
 
-               skip_vlan = true;
-               if (dissector_uses_key(flow_dissector,
-                                      FLOW_DISSECTOR_KEY_VLAN)) {
+               if (dissector_vlan == FLOW_DISSECTOR_KEY_MAX) {
+                       dissector_vlan = FLOW_DISSECTOR_KEY_VLAN;
+               } else if (dissector_vlan == FLOW_DISSECTOR_KEY_VLAN) {
+                       dissector_vlan = FLOW_DISSECTOR_KEY_CVLAN;
+               } else {
+                       fdret = FLOW_DISSECT_RET_PROTO_AGAIN;
+                       break;
+               }
+
+               if (dissector_uses_key(flow_dissector, dissector_vlan)) {
                        key_vlan = skb_flow_dissector_target(flow_dissector,
-                                                            FLOW_DISSECTOR_KEY_VLAN,
+                                                            dissector_vlan,
                                                             target_container);
 
-                       if (vlan_tag_present) {
+                       if (!vlan) {
                                key_vlan->vlan_id = skb_vlan_tag_get_id(skb);
                                key_vlan->vlan_priority =
                                        (skb_vlan_tag_get_prio(skb) >> VLAN_PRIO_SHIFT);
@@ -789,6 +804,7 @@ proto_again:
                                        (ntohs(vlan->h_vlan_TCI) &
                                         VLAN_PRIO_MASK) >> VLAN_PRIO_SHIFT;
                        }
+                       key_vlan->vlan_tpid = saved_vlan_tpid;
                }
 
                fdret = FLOW_DISSECT_RET_PROTO_AGAIN;