From: David S. Miller <davem@davemloft.net> Date: Tue, 28 Jan 2014 20:00:00 +0000 (-0800) Subject: Merge branch 'qlcnic' X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=77c14e512f5361e2b859c2ad05a54b5679b0f2d8;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge branch 'qlcnic' Rajesh Borundia says: ==================== qlcnic: bug fixes The patch series contains following bug fixes o Bound checks for number of receive descriptors and number of recieve rings. Both of these have off-by-one errors. o Vlan list was getting re-initialized in case of adapter reset. o Tx queue was timing out because of missing start queue for a corresponding netif_tx_disable. o Loopback test failed because driver was not setting linkup variable while handling link events. ==================== Signed-off-by: David S. Miller <davem@davemloft.net> --- 77c14e512f5361e2b859c2ad05a54b5679b0f2d8