Merge branch 'sfc-txq-lookups'

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 <davem@davemloft.net>