diff options
| author |   Vladimir Oltean <vladimir.oltean@nxp.com> | 2021-06-14 16:58:19 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2021-06-14 13:15:22 -0700 |
| commit | ec13357263fb672390250fcfaa4c86b6dce66062 (patch) | |
| tree | d05483563d9e6bf0efad2442cac26a54dc754ef6 /net/core/flow_dissector.c | |
| parent | net: dsa: sja1105: constify the sja1105_regs structures (diff) | |
| download | linux-dev-ec13357263fb672390250fcfaa4c86b6dce66062.tar.xz linux-dev-ec13357263fb672390250fcfaa4c86b6dce66062.zip | |
net: flow_dissector: fix RPS on DSA masters
After the blamed patch, __skb_flow_dissect() on the DSA master stopped
adjusting for the length of the DSA headers. This is because it was told
to adjust only if the needed_headroom is zero, aka if there is no DSA
header. Of course, the adjustment should be done only if there _is_ a
DSA header.
Modify the comment too so it is clearer.
Fixes: 4e50025129ef ("net: dsa: generalize overhead for taggers that use both headers and trailers")
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/flow_dissector.c')
| -rw-r--r-- | net/core/flow_dissector.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c index c04455981c1e..2aadbfc5193b 100644 --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c @@ -943,8 +943,8 @@ bool __skb_flow_dissect(const struct net *net, int offset = 0; ops = skb->dev->dsa_ptr->tag_ops; - /* Tail taggers don't break flow dissection */ - if (!ops->needed_headroom) { + /* Only DSA header taggers break flow dissection */ + if (ops->needed_headroom) { if (ops->flow_dissect) ops->flow_dissect(skb, &proto, &offset); else |