renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-15 09:03:59 +08:00
Code
16587c210c
linux-next/drivers/net/ethernet/mellanox/mlx4
History
David S. Miller 3118e6e19d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
The UDP offload conflict is dealt with by simply taking what is
in net-next where we have removed all of the UFO handling code
entirely.

The TCP conflict was a case of local variables in a function
being removed from both net and net-next.

In netvsc we had an assignment right next to where a missing
set of u64 stats sync object inits were added.

Signed-off-by: David S. Miller <davem@davemloft.net>
2017-08-09 16:28:45 -07:00
..
alloc.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2017-07-20 16:33:39 -07:00
catas.c net/mlx4_core: Avoid command timeouts during VF driver device shutdown 2017-01-30 15:45:27 -05:00
cmd.c net/mlx4: fix spelling mistake: "enforcment" -> "enforcement" 2017-06-29 12:25:01 -04:00
cq.c {net, IB}/mlx4: Remove gfp flags argument 2017-07-17 21:21:24 -04:00
en_clock.c net/mlx4_en: fix overflow in mlx4_en_init_timestamp() 2017-02-26 15:39:43 -05:00
en_cq.c mlx4_en: remove unnecessary returned value 2017-07-24 16:29:55 -07:00
en_dcb_nl.c net/mlx4_en: Do not allocate redundant TX queues when TC is disabled 2017-06-29 15:56:15 -04:00
en_ethtool.c net/mlx4_en: Fix wrong indication of Wake-on-LAN (WoL) support 2017-08-02 10:44:09 -07:00
en_main.c mlx4_en: remove unnecessary error check 2017-07-24 17:26:32 -07:00
en_netdev.c net: sched: get rid of struct tc_to_netdev 2017-08-07 09:42:37 -07:00
en_port.c mlx4: add rx_alloc_pages counter in ethtool -S 2017-03-09 09:54:46 -08:00
en_port.h net/mlx4_en: Check the enabling pptx/pprx flags in SET_PORT wrapper flow 2017-01-30 15:26:43 -05:00
en_resources.c net/mlx4_en: Do not allocate redundant TX queues when TC is disabled 2017-06-29 15:56:15 -04:00
en_rx.c net/mlx4_en: don't set CHECKSUM_COMPLETE on SCTP packets 2017-08-08 17:59:57 -07:00
en_selftest.c networking: make skb_put & friends return void pointers 2017-06-16 11:48:39 -04:00
en_tx.c {net, IB}/mlx4: Remove gfp flags argument 2017-07-17 21:21:24 -04:00
eq.c net/mlx4_core: Use cq quota in SRIOV when creating completion EQs 2017-02-23 10:57:57 -05:00
fw_qos.c
fw_qos.h
fw.c net/mlx4_core: Fixes missing capability bit in flags2 capability dump 2017-08-02 10:44:09 -07:00
fw.h net/mlx4_en: Fix wrong indication of Wake-on-LAN (WoL) support 2017-08-02 10:44:09 -07:00
icm.c {net, IB}/mlx4: Remove gfp flags argument 2017-07-17 21:21:24 -04:00
icm.h {net, IB}/mlx4: Remove gfp flags argument 2017-07-17 21:21:24 -04:00
intf.c net/mlx4: Change ENOTSUPP to EOPNOTSUPP 2017-02-23 10:57:56 -05:00
Kconfig ptp_clock: Allow for it to be optional 2016-11-16 09:26:34 +01:00
main.c net/mlx4_en: Fix wrong indication of Wake-on-LAN (WoL) support 2017-08-02 10:44:09 -07:00
Makefile
mcg.c net/mlx4: Fix the check in attaching steering rules 2017-06-04 23:10:05 -04:00
mlx4_en.h mlx4_en: remove unnecessary returned value 2017-07-24 16:29:55 -07:00
mlx4_stats.h mlx4: add rx_alloc_pages counter in ethtool -S 2017-03-09 09:54:46 -08:00
mlx4.h {net, IB}/mlx4: Remove gfp flags argument 2017-07-17 21:21:24 -04:00
mr.c {net, IB}/mlx4: Remove gfp flags argument 2017-07-17 21:21:24 -04:00
pd.c io-mapping: Specify mapping size for io_mapping_map_wc() 2016-04-28 12:17:32 +01:00
port.c net/mlx4_en: fix a condition 2017-02-06 12:01:06 -05:00
profile.c
qp.c {net, IB}/mlx4: Remove gfp flags argument 2017-07-17 21:21:24 -04:00
reset.c
resource_tracker.c {net, IB}/mlx4: Remove gfp flags argument 2017-07-17 21:21:24 -04:00
sense.c
srq.c {net, IB}/mlx4: Remove gfp flags argument 2017-07-17 21:21:24 -04:00