Skip to content

Commit

Permalink
net: flow_dissector: fix RPS on DSA masters
Browse files Browse the repository at this point in the history
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: 4e50025 ("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>
  • Loading branch information
Vladimir Oltean authored and David S. Miller committed Jun 14, 2021
1 parent 3009e8a commit ec13357
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions net/core/flow_dissector.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ec13357

Please sign in to comment.