From: David S. Miller <davem@davemloft.net>
Date: Mon, 29 Mar 2021 20:29:49 +0000 (-0700)
Subject: Merge branch 'mlxsw-ecn-marking'
X-Git-Tag: v5.12-rc7~13^2~66
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2dce6987a66d292ab08fcde9e65ae34d5d2f1a94;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'mlxsw-ecn-marking'

Ido Schimmel says:

====================
mlxsw: spectrum: Fix ECN marking in tunnel decapsulation

Patch #1 fixes a discrepancy between the software and hardware data
paths with regards to ECN marking after decapsulation. See the changelog
for a detailed description.

Patch #2 extends the ECN decap test to cover all possible combinations
of inner and outer ECN markings. The test passes over both data paths.

v2:
* Only set ECT(1) if inner is ECT(0)
* Introduce a new helper to determine inner ECN. Share it between NVE
  and IP-in-IP tunnels
* Extend the selftest
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

2dce6987a66d292ab08fcde9e65ae34d5d2f1a94