Revert "net/sched: cls_flower: Remove match on n_proto"
authorBoris Sukholitko <boris.sukholitko@broadcom.com>
Mon, 21 Jun 2021 09:24:29 +0000 (12:24 +0300)
committerDavid S. Miller <davem@davemloft.net>
Mon, 21 Jun 2021 21:46:36 +0000 (14:46 -0700)
commit6d5516177d3b723fe9701b89e69db18cf0ca0421
tree293bdb66a14c193b45047d3b7d1400d2f815048a
parentce03b94ba682a67e8233c9ee3066071656ded58f
Revert "net/sched: cls_flower: Remove match on n_proto"

This reverts commit 0dca2c7404a938cb10c85d0515cee40ed5348788.

The commit in question breaks hardware offload of flower filters.

Quoting Vladimir Oltean <olteanv@gmail.com>:

 fl_hw_replace_filter() and fl_reoffload() create a struct
 flow_cls_offload with a rule->match.mask member derived from the mask
 of the software classifier: &f->mask->key - that same mask that is used
 for initializing the flow dissector keys, and the one from which Boris
 removed the basic.n_proto member because it was bothering him.

Reported-by: Vadym Kochan <vadym.kochan@plvision.eu>
Signed-off-by: Boris Sukholitko <boris.sukholitko@broadcom.com>
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sched/cls_flower.c