From: David S. Miller Date: Sat, 25 May 2013 06:05:11 +0000 (-0700) Subject: Merge branch 'qlcnic' X-Git-Tag: firefly_0821_release~176^2~5703^2~316 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6e2842f4bbb5abcf57d3cb0f10870e0ce20c0ba2;p=firefly-linux-kernel-4.4.55.git Merge branch 'qlcnic' Shahed Shaikh says: ==================== This patch series includes following changes: * Support for spoof check configuration per VF using iproute2 tool. * Set HW mask for 8300 adapter in INT-x mode to stop generating interrupts. * Updated IRQ name for 8200 and 8300 Series adapter as per format used by other multiqueue drivers. * Remove qlcnic_config_npars module parameter. * Initialize trans_work and idc_aen_work at VF probe. * Convert netsted if-else into switch-case statement. * Change in diagnostics routine. * Modify reset recovery path in diag mode by providing diagnostics routines enough time to unwind before proceeding with reset recovery. * Implement GET_LED_STATUS command for 82xx adapter and refactor qlcnic_store_beacon() to split 8200 and 8300 specific calls. * Some cleanup and log enhancements ==================== Signed-off-by: David S. Miller --- 6e2842f4bbb5abcf57d3cb0f10870e0ce20c0ba2