openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/drivers/net/ethernet/mellanox/mlx4
History
David S. Miller 739e4a758e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/usb/r8152.c
	net/netfilter/nfnetlink.c

Both r8152 and nfnetlink conflicts were simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
 		2014-10-02 11:25:43 -07:00
..
Kconfig net/mlx4: Set proper build dependancy with vxlan 2014-04-01 16:25:51 -04:00
Makefile net/mlx4_en: Add HW timestamping (TS) support 2013-04-24 16:30:14 -04:00
alloc.c IB/mlx4: Implement IB_QP_CREATE_USE_GFP_NOIO 2014-06-02 14:58:11 -07:00
catas.c mlx4: Add support for EEH error recovery 2012-07-25 15:24:13 -07:00
cmd.c net/mlx4_core: Deprecate error message at ConnectX-2 cards startup to debug 2014-09-30 16:27:50 -04:00
cq.c net/mlx4_en: Don't use irq_affinity_notifier to track changes in IRQ affinity map 2014-07-02 18:29:23 -07:00
en_clock.c ptp: drivers: set the number of programmable pins. 2014-03-21 14:21:14 -04:00
en_cq.c net/mlx4_en: cq->irq_desc wasn't set in legacy EQ's 2014-07-16 23:28:32 -07:00
en_dcb_nl.c net/mlx4_en: Fix UP limit in ieee_ets->prio_tc 2014-03-02 20:04:00 -05:00
en_ethtool.c net/mlx4_en: do not ignore autoneg in mlx4_en_set_pauseparam() 2014-09-08 15:54:26 -07:00
en_main.c mellanox: Change en_print to return void 2014-09-26 15:17:16 -04:00
en_netdev.c net/mlx4_en: Add mlx4_en_get_cqe helper 2014-09-19 17:30:11 -04:00
en_port.c net/mlx4_en: Move queue stopped/waked counters to be per ring 2014-03-02 20:04:01 -05:00
en_port.h net/mlx4_core: set port QoS attributes 2012-04-05 05:08:03 -04:00
en_resources.c net/mlx4_en: Add netdev support for TCP/IP offloads of vxlan tunneling 2013-12-31 14:31:43 -05:00
en_rx.c net/mlx4_en: Add mlx4_en_get_cqe helper 2014-09-19 17:30:11 -04:00
en_selftest.c net/mlx4_en: Run loopback test only when port is up 2014-07-08 19:58:44 -07:00
en_tx.c mlx4: exploit skb->xmit_more to conditionally send doorbell 2014-09-28 17:27:36 -04:00
eq.c net/mlx4_core: Cache line EQE size support 2014-09-19 17:30:10 -04:00
fw.c net/mlx4_core: Protect QUERY_PORT wrapper from untrusted guests 2014-09-30 16:27:49 -04:00
fw.h net/mlx4_core: Enable CQE/EQE stride support 2014-09-19 17:30:10 -04:00
icm.c mlx4_core: Fix GFP flags parameters to be gfp_t 2014-06-04 10:19:13 -07:00
icm.h mlx4_core: Fix GFP flags parameters to be gfp_t 2014-06-04 10:19:13 -07:00
intf.c mlx4: Use port management change event instead of smp_snoop 2012-07-10 09:47:10 -07:00
main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-10-02 11:25:43 -07:00
mcg.c net/mlx4: Move the tunnel steering helper function to mlx4_core 2014-08-29 20:13:00 -07:00
mlx4.h net/mlx4_core: Enable CQE/EQE stride support 2014-09-19 17:30:10 -04:00
mlx4_en.h mellanox: Change en_print to return void 2014-09-26 15:17:16 -04:00
mr.c mlx4: Correct error flows in rereg_mr 2014-09-22 08:47:47 -07:00
pd.c drivers/net: delete non-required instances of include <linux/init.h> 2014-01-16 11:53:26 -08:00
port.c mlx4: Fix mlx4 reg/unreg mac to work properly with 0-mac addresses 2014-09-22 09:46:53 -07:00
profile.c mellanox: Logging message cleanups 2014-05-08 23:42:02 -04:00
qp.c net/mlx4: Set vlan stripping policy by the right command 2014-09-10 15:21:34 -07:00
reset.c mellanox: Logging message cleanups 2014-05-08 23:42:02 -04:00
resource_tracker.c net/mlx4: Set vlan stripping policy by the right command 2014-09-10 15:21:34 -07:00
sense.c Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq 2012-10-02 09:54:49 -07:00
srq.c IB/mlx4: Implement IB_QP_CREATE_USE_GFP_NOIO 2014-06-02 14:58:11 -07:00