leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
56a4342dfe
linux/drivers/net/ethernet/qlogic/qlcnic
History
David S. Miller 56a4342dfe Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c
	net/ipv6/ip6_tunnel.c
	net/ipv6/ip6_vti.c

ipv6 tunnel statistic bug fixes conflicting with consolidation into
generic sw per-cpu net stats.

qlogic conflict between queue counting bug fix and the addition
of multiple MAC address support.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-01-06 17:37:45 -05:00
..
Makefile qlcnic: dcb: Query adapter DCB capabilities. 2013-08-27 15:21:13 -04:00
qlcnic_83xx_hw.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-01-06 17:37:45 -05:00
qlcnic_83xx_hw.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-12-18 16:42:06 -05:00
qlcnic_83xx_init.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-12-18 16:42:06 -05:00
qlcnic_83xx_vnic.c qlcnic: Support for 16 virtual NIC functions. 2013-12-17 17:09:44 -05:00
qlcnic_ctx.c qlcnic: Support for 16 virtual NIC functions. 2013-12-17 17:09:44 -05:00
qlcnic_dcb.c qlcnic: Issue INIT_NIC command only once. 2013-12-17 17:09:43 -05:00
qlcnic_dcb.h qlcnic: Issue INIT_NIC command only once. 2013-12-17 17:09:43 -05:00
qlcnic_ethtool.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-12-18 16:42:06 -05:00
qlcnic_hdr.h qlcnic: Support for 16 virtual NIC functions. 2013-12-17 17:09:44 -05:00
qlcnic_hw.c net: qlcnic: slight optimization of addr compare 2013-12-31 16:48:32 -05:00
qlcnic_hw.h qlcnic: refactor Tx/SDS ring calculation and validation in driver. 2013-11-04 15:33:19 -05:00
qlcnic_init.c qlcnic: Fix bug in Tx completion path 2014-01-03 20:44:11 -05:00
qlcnic_io.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-01-06 17:37:45 -05:00
qlcnic_main.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-01-06 17:37:45 -05:00
qlcnic_minidump.c qlcnic: Skip unknown entry type while collecting firmware dump 2013-10-18 13:42:19 -04:00
qlcnic_sriov_common.c qlcnic: VLAN enhancement for 84XX adapters 2013-12-17 17:09:43 -05:00
qlcnic_sriov_pf.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-01-06 17:37:45 -05:00
qlcnic_sriov.h qlcnic: VLAN enhancement for 84XX adapters 2013-12-17 17:09:43 -05:00
qlcnic_sysfs.c qlcnic: Support for 16 virtual NIC functions. 2013-12-17 17:09:44 -05:00
qlcnic.h Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-01-06 17:37:45 -05:00