David S. Miller 446bf64b61 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Merge conflict of mlx5 resolved using instructions in merge
commit 9566e650bf.

Signed-off-by: David S. Miller <davem@davemloft.net>

2019-08-19 11:54:03 -07:00

..

cn23xx_pf_device.c

liquidio: using NULL instead of plain integer

2019-02-18 16:40:08 -08:00

cn23xx_pf_device.h

liquidio: enhanced ethtool --set-channels feature

2018-04-30 09:26:29 -04:00

cn23xx_pf_regs.h

liquidio CN23XX: fix for new check patch errors

2016-11-15 22:24:40 -05:00

cn23xx_vf_device.c

liquidio CN23XX: Remove set but not used variable 'ring_flag'

2018-09-06 15:53:47 -07:00

cn23xx_vf_device.h

liquidio: moved wait_for_pending_requests to octeon_network.h

2017-08-14 22:21:39 -07:00

cn23xx_vf_regs.h

liquidio CN23XX: VF register definitions

2016-11-30 11:03:08 -05:00

cn66xx_device.c

drivers: Remove explicit invocations of mmiowb()

2019-04-08 12:01:02 +01:00

cn66xx_device.h

liquidio CN23XX: copyrights changes and alignment

2016-11-15 22:24:40 -05:00

cn66xx_regs.h

liquidio CN23XX: fix for new check patch errors

2016-11-15 22:24:40 -05:00

cn68xx_device.c

liquidio CN23XX: fix for new check patch errors

2016-11-15 22:24:40 -05:00

cn68xx_device.h

liquidio CN23XX: copyrights changes and alignment

2016-11-15 22:24:40 -05:00

cn68xx_regs.h

liquidio CN23XX: copyrights changes and alignment

2016-11-15 22:24:40 -05:00

lio_core.c

net: lio_core: fix potential sign-extension overflow on large shift

2019-06-18 21:00:40 -04:00

lio_ethtool.c

liquidio: fix spelling mistake "deferal" -> "deferral"

2018-11-30 13:17:38 -08:00

lio_main.c

net: Use skb accessors in network drivers

2019-07-22 20:47:56 -07:00

lio_vf_main.c

net: Use skb accessors in network drivers

2019-07-22 20:47:56 -07:00

lio_vf_rep.c

liquidio: Implement ndo_get_port_parent_id()

2019-02-06 14:16:11 -08:00

lio_vf_rep.h

liquidio: synchronize VF representor names with NIC firmware

2017-11-02 17:04:06 +09:00

liquidio_common.h

liquidio: Add the features to show FEC settings and set FEC settings

2018-09-17 08:22:26 -07:00

liquidio_image.h

liquidio: allow override of firmware present in flash

2017-09-25 20:25:39 -07:00

Makefile

net: liquidio: clean up Makefile for simpler composite object handling

2018-03-26 02:01:27 +09:00

octeon_config.h

liquidio: remove obsolete functions and data structures

2018-08-29 20:07:42 -07:00

octeon_console.c

liquidio: use ktime_get_real_ts64() instead of getnstimeofday64()

2018-07-12 14:55:39 -07:00

octeon_device.c

drivers: Remove explicit invocations of mmiowb()

2019-04-08 12:01:02 +01:00

octeon_device.h

liquidio: Add the features to show FEC settings and set FEC settings

2018-09-17 08:22:26 -07:00

octeon_droq.c

drivers: Remove explicit invocations of mmiowb()

2019-04-08 12:01:02 +01:00

octeon_droq.h

liquidio: Removed droq lock

2018-09-11 23:37:06 -07:00

octeon_iq.h

liquidio: Added delayed work for periodically updating the link statistics.

2018-09-03 19:08:07 -07:00

octeon_mailbox.c

liquidio: Use pcie_flr() instead of reimplementing it

2019-08-08 22:41:02 -07:00

octeon_mailbox.h

liquidio: Added ndo_get_vf_stats support

2018-04-20 10:53:46 -04:00

octeon_main.h

liquidio: Per queue oom work queue

2018-09-11 23:37:06 -07:00

octeon_mem_ops.c

liquidio: stop using huge static buffer, save 4096k in .data

2017-06-22 11:03:00 -04:00

octeon_mem_ops.h

liquidio: stop using huge static buffer, save 4096k in .data

2017-06-22 11:03:00 -04:00

octeon_network.h

liquidio: Add the features to show FEC settings and set FEC settings

2018-09-17 08:22:26 -07:00

octeon_nic.c

liquidio: Add spoof checking on a VF MAC address

2018-09-06 15:52:18 -07:00

octeon_nic.h

liquidio: change octnic_ctrl_pkt to do synchronous soft commands

2018-08-29 20:07:41 -07:00

request_manager.c

liquidio: add cleanup in octeon_setup_iq()

2019-08-15 12:37:37 -07:00

response_manager.c

liquidio: improve soft command handling

2018-08-29 20:07:41 -07:00

response_manager.h

liquidio: improve soft command handling

2018-08-29 20:07:41 -07:00