From: David S. Miller Date: Wed, 21 Apr 2021 00:03:53 +0000 (-0700) Subject: Merge branch 'sfc-txq-lookups' X-Git-Tag: v5.13-rc1~94^2~36^2~19 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eeddfd8e8d392bc94968d87e7a408ba9e9be4722;p=thirdparty%2Fkernel%2Flinux.git Merge branch 'sfc-txq-lookups' Edward Cree says: ==================== sfc: fix TXQ lookups The TXQ handling changes in 12804793b17c ("sfc: decouple TXQ type from label") which were made as part of the support for encap offloads on EF10 caused some breakage on Siena (5000- and 6000-series) NICs, which caused null-dereference kernel panics. This series fixes those issues, and also a similarly incorrect code-path on EF10 which worked by chance. ==================== Signed-off-by: David S. Miller --- eeddfd8e8d392bc94968d87e7a408ba9e9be4722