From: David S. Miller Date: Fri, 19 Apr 2013 20:16:42 +0000 (-0400) Subject: Merge branch 'qlcnic' X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=92352df1dbc5fa2dacfa3b16d57b4641d26be880;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'qlcnic' Rajesh Borundia says: ==================== * "qlcnic: Change 82xx adapter VLAN id endian type". - Adapter requires VLAN id in little endian. VLAN id was being converted to __le16 and then passed as a parameter. Pass VLAN id as u16 and then use cpu_to_le16 at appropriate places. It is appropriate for net-next as SR-IOV patches have a dependency on it. * "qlcnic: Fix loopback test for SR-IOV PF". - It is appropriate for net-next as change is needed for SRIOV PF only. * Remaining patches add enhancements to SR-IOV functionality like - FLR handling - Adapter reset recovery handling - iproute2 tool support for configuring MAC address, Tx rate and VLAN id. - Mailbox polling support for SR-IOV PF in case mailbox interrupts are disabled. ==================== Signed-off-by: David S. Miller --- 92352df1dbc5fa2dacfa3b16d57b4641d26be880