linux_dsm_epyc7002/drivers/net/ethernet/qlogic/qlcnic
David S. Miller d247b6ab3c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/Makefile
	net/ipv6/sysctl_net_ipv6.c

Two ipv6_table_template[] additions overlap, so the index
of the ipv6_table[x] assignments needed to be adjusted.

In the drivers/net/Makefile case, we've gotten rid of the
garbage whereby we had to list every single USB networking
driver in the top-level Makefile, there is just one
"USB_NETWORKING" that guards everything.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-08-05 18:46:26 -07:00
..
Makefile qlcnic: dcb: Query adapter DCB capabilities. 2013-08-27 15:21:13 -04:00
qlcnic_83xx_hw.c qlcnic: Collect firmware dump using DMA on 82xx adapters 2014-05-09 13:08:58 -04:00
qlcnic_83xx_hw.h qlcnic: remove duplicate QLC_83XX_GET_LSO_CAPABILITY define 2014-06-11 15:01:30 -07:00
qlcnic_83xx_init.c qlcnic: Collect firmware dump using DMA on 82xx adapters 2014-05-09 13:08:58 -04:00
qlcnic_83xx_vnic.c qlcnic: Use bool for rx_mac_learn. 2014-01-23 16:13:08 -08:00
qlcnic_ctx.c qlcnic: Set driver version before registering netdev 2014-08-05 16:23:26 -07:00
qlcnic_dcb.c Update setapp/getapp prototypes in dcbnl_rtnl_ops to return int instead of u8 2014-07-17 16:02:29 -07:00
qlcnic_dcb.h qlcnic: Issue INIT_NIC command only once. 2013-12-17 17:09:43 -05:00
qlcnic_ethtool.c qlcnic: Fix update of ethtool stats. 2014-08-05 16:23:26 -07:00
qlcnic_hdr.h qlcnic: Support for 16 virtual NIC functions. 2013-12-17 17:09:44 -05:00
qlcnic_hw.c qlogic: Use time_before() 2014-05-22 15:50:12 -04:00
qlcnic_hw.h qlcnic: Add VXLAN Rx offload support 2014-03-24 00:44:23 -04:00
qlcnic_init.c qlcnic: Fix bug in Tx completion path 2014-01-03 20:44:11 -05:00
qlcnic_io.c qlcnic: Add mac learning support to SR-IOV VF. 2014-05-09 13:08:58 -04:00
qlcnic_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-08-05 18:46:26 -07:00
qlcnic_minidump.c qlcnic: Pre-allocate DMA buffer used for minidump collection 2014-06-11 15:44:29 -07:00
qlcnic_sriov_common.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-06-05 16:22:02 -07:00
qlcnic_sriov_pf.c net-next:v4: Add support to configure SR-IOV VF minimum and maximum Tx rate through ip tool. 2014-05-23 15:04:02 -04:00
qlcnic_sriov.h net-next:v4: Add support to configure SR-IOV VF minimum and maximum Tx rate through ip tool. 2014-05-23 15:04:02 -04:00
qlcnic_sysfs.c qlcnic: Add driver logs in error path. 2014-04-27 23:20:53 -04:00
qlcnic.h qlcnic: Update version to 5.3.61 2014-07-02 17:10:29 -07:00