diff options
| author |   Vladimir Oltean <vladimir.oltean@nxp.com> | 2021-06-11 22:01:24 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2021-06-11 12:45:38 -0700 |
| commit | 4e50025129efabb07714c1f27a80526897da374b (patch) | |
| tree | bef1017e42111f0e3ffc5d6119ea58a677b6aa35 /net/core/flow_dissector.c | |
| parent | net: dsa: sja1105: allow RX timestamps to be taken on all ports for SJA1110 (diff) | |
| download | linux-dev-4e50025129efabb07714c1f27a80526897da374b.tar.xz linux-dev-4e50025129efabb07714c1f27a80526897da374b.zip | |
net: dsa: generalize overhead for taggers that use both headers and trailers
Some really really weird switches just couldn't decide whether to use a
normal or a tail tagger, so they just did both.
This creates problems for DSA, because we only have the concept of an
'overhead' which can be applied to the headroom or to the tailroom of
the skb (like for example during the central TX reallocation procedure),
depending on the value of bool tail_tag, but not to both.
We need to generalize DSA to cater for these odd switches by
transforming the 'overhead / tail_tag' pair into 'needed_headroom /
needed_tailroom'.
The DSA master's MTU is increased to account for both.
The flow dissector code is modified such that it only calls the DSA
adjustment callback if the tagger has a non-zero header length.
Taggers are trivially modified to declare either needed_headroom or
needed_tailroom, based on the tail_tag value that they currently
declare.
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/core/flow_dissector.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c index 3ed7c98a98e1..c04455981c1e 100644 --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c @@ -944,7 +944,7 @@ bool __skb_flow_dissect(const struct net *net, ops = skb->dev->dsa_ptr->tag_ops; /* Tail taggers don't break flow dissection */ - if (!ops->tail_tag) { + if (!ops->needed_headroom) { if (ops->flow_dissect) ops->flow_dissect(skb, &proto, &offset); else |