Jakub Kicinski b6df00789e Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Trivial conflict in net/netfilter/nf_tables_api.c.

Duplicate fix in tools/testing/selftests/net/devlink_port_split.py
- take the net-next version.

skmsg, and L4 bpf - keep the bpf code but remove the flags
and err params.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

2021-06-29 15:45:27 -07:00

..

falcon

sfc: falcon: use DEVICE_ATTR_*() macro

2021-05-23 17:18:42 -07:00

bitfield.h

sfc: extend bitfield macros to 19 fields

2020-11-13 15:33:03 -08:00

ef10_regs.h

…

ef10_sriov.c

sfc: avoid duplicated code in ef10_sriov

2021-06-22 09:51:13 -07:00

ef10_sriov.h

…

ef10.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2021-06-29 15:45:27 -07:00

ef100_ethtool.c

sfc: add ethtool ops and miscellaneous ndos to EF100

2020-09-07 14:46:13 -07:00

ef100_ethtool.h

…

ef100_netdev.c

sfc: add ethtool ops and miscellaneous ndos to EF100

2020-09-07 14:46:13 -07:00

ef100_netdev.h

…

ef100_nic.c

sfc: support GRE TSO on EF100

2020-11-13 15:33:30 -08:00

ef100_nic.h

…

ef100_regs.h

…

ef100_rx.c

…

ef100_rx.h

…

ef100_tx.c

sfc: support GRE TSO on EF100

2020-11-13 15:33:30 -08:00

ef100_tx.h

sfc: make ef100 xmit_more handling look more like ef10's

2020-09-05 12:21:39 -07:00

ef100.c

sfc: Fix error code in probe

2020-09-21 13:55:13 -07:00

ef100.h

…

efx_channels.c

sfc: adjust efx->xdp_tx_queue_count with the real number of initialized queues

2021-04-27 15:38:29 -07:00

efx_channels.h

sfc: cleanups around efx_alloc_channel

2020-09-11 14:55:14 -07:00

efx_common.c

sfc: use DEVICE_ATTR_*() macro

2021-05-23 17:18:42 -07:00

efx_common.h

sfc: advertise encapsulated offloads on EF10

2020-09-11 17:15:22 -07:00

efx.c

sfc: use DEVICE_ATTR_*() macro

2021-05-23 17:18:42 -07:00

efx.h

…

enum.h

sfc: Remove duplicate argument

2021-04-14 13:55:07 -07:00

ethtool_common.c

sfc: decouple TXQ type from label

2020-09-11 17:15:22 -07:00

ethtool_common.h

…

ethtool.c

sfc: ef10: implement ethtool::get_fec_stats

2021-04-15 17:08:29 -07:00

farch_regs.h

…

farch.c

sfc: farch: fix compile warning in efx_farch_dimension_resources()

2021-05-21 13:52:26 -07:00

filter.h

…

io.h

…

Kconfig

…

Makefile

…

mcdi_filters.c

…

mcdi_filters.h

…

mcdi_functions.c

sfc: de-indirect TSO handling

2020-09-11 17:15:22 -07:00

mcdi_functions.h

sfc: de-indirect TSO handling

2020-09-11 17:15:22 -07:00

mcdi_mon.c

…

mcdi_pcol.h

…

mcdi_port_common.c

sfc: coding style cleanups in mcdi_port_common.c

2020-09-08 20:14:33 -07:00

mcdi_port_common.h

sfc: coding style cleanups in mcdi_port_common.c

2020-09-08 20:14:33 -07:00

mcdi_port.c

sfc: remove phy_op indirection

2020-09-07 14:46:13 -07:00

mcdi_port.h

…

mcdi.c

…

mcdi.h

sfc: fix kdoc warning

2020-09-25 16:29:00 -07:00

mtd.c

…

net_driver.h

sfc: ef10: implement ethtool::get_fec_stats

2021-04-15 17:08:29 -07:00

nic_common.h

net: sfc: Replace in_interrupt() usage

2020-09-29 14:02:54 -07:00

nic.c

net:sfc: fix non-freed irq in legacy irq mode

2021-05-21 14:51:10 -07:00

nic.h

sfc: de-indirect TSO handling

2020-09-11 17:15:22 -07:00

ptp.c

drivers/net/ethernet: clean up mis-targeted comments

2020-09-25 16:29:00 -07:00

ptp.h

…

rx_common.c

xsk: Propagate napi_id to XDP socket Rx path

2020-12-01 00:09:25 +01:00

rx_common.h

…

rx.c

sfc: Remove rcu_read_lock() around XDP program invocation

2021-06-24 19:46:01 +02:00

selftest.c

sfc: define inner/outer csum offload TXQ types

2020-09-11 17:15:22 -07:00

selftest.h

sfc: decouple TXQ type from label

2020-09-11 17:15:22 -07:00

siena_sriov.c

…

siena_sriov.h

…

siena.c

…

sriov.c

…

sriov.h

…

tx_common.c

sfc: de-indirect TSO handling

2020-09-11 17:15:22 -07:00

tx_common.h

…

tx_tso.c

…

tx.c

bpf, devmap: Move drop error path to devmap for XDP_REDIRECT

2021-03-18 16:38:51 +01:00

tx.h

sfc: select inner-csum-offload TX queues for skbs that need it

2020-09-11 17:15:22 -07:00

vfdi.h

…

workarounds.h

…