1 files changed, 12 insertions, 0 deletions

diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
index 0cc672aba1f0..5b5be9577257 100644
--- a/net/core/flow_dissector.c
+++ b/net/core/flow_dissector.c
@@ -4,6 +4,7 @@
 #include <linux/ip.h>
 #include <linux/ipv6.h>
 #include <linux/if_vlan.h>
+#include <net/dsa.h>
 #include <net/ip.h>
 #include <net/ipv6.h>
 #include <net/gre.h>
@@ -440,6 +441,17 @@ bool __skb_flow_dissect(const struct sk_buff *skb,
                          skb->vlan_proto : skb->protocol;
                 nhoff = skb_network_offset(skb);
                 hlen = skb_headlen(skb);
+                if (unlikely(netdev_uses_dsa(skb->dev))) {
+                        const struct dsa_device_ops *ops;
+                        int offset;
+
+                        ops = skb->dev->dsa_ptr->tag_ops;
+                        if (ops->flow_dissect &&
+                            !ops->flow_dissect(skb, &proto, &offset)) {
+                                hlen -= offset;
+                                nhoff += offset;
+                        }
+                }
         }
 
         /* It is ensured by skb_flow_dissector_init() that control key will