From: David S. Miller <davem@davemloft.net>
Date: Mon, 4 Nov 2013 20:33:53 +0000 (-0500)
Subject: Merge branch 'qlcnic'
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=96635fbd0b6c9113a374333092f40fc34fccb4f7;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'qlcnic'

Himanshu Madhani says:

====================
qlcnic: Multiple Tx queue support and code refactoring

This Patch series contains following changes

o Refactored code to calculate, validate and assign Tx/SDS rings for  various modes of driver.
o Enhanced ethtool statistics for multi Tx queue on all supported adapters.
o Enable multiple Tx queue for 83xx and 84xx Series adapters.
o Register netdev for failed device state.

changes from v1 -> v2
o Dropped patch to replace inappropriate usage of kzalloc() with vzalloc().

Please apply to net-next.
====================

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

96635fbd0b6c9113a374333092f40fc34fccb4f7