Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorDavid S. Miller <davem@davemloft.net>
Sun, 26 Jul 2020 00:49:04 +0000 (17:49 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 26 Jul 2020 00:49:04 +0000 (17:49 -0700)
commita57066b1a01977a646145f4ce8dfb4538b08368a
tree57c2b4fa2fc48e687a1820b9bf4ef4f4363be0f9
parentdfecd3e00cd32b2a6d1cfdb30b513dd42575ada3
parent04300d66f0a06d572d9f2ad6768c38cabde22179
Merge git://git./linux/kernel/git/netdev/net

The UDP reuseport conflict was a little bit tricky.

The net-next code, via bpf-next, extracted the reuseport handling
into a helper so that the BPF sk lookup code could invoke it.

At the same time, the logic for reuseport handling of unconnected
sockets changed via commit efc6b6f6c3113e8b203b9debfb72d81e0f3dcace
which changed the logic to carry on the reuseport result into the
rest of the lookup loop if we do not return immediately.

This requires moving the reuseport_has_conns() logic into the callers.

While we are here, get rid of inline directives as they do not belong
in foo.c files.

The other changes were cases of more straightforward overlapping
modifications.

Signed-off-by: David S. Miller <davem@davemloft.net>
58 files changed:
MAINTAINERS
Makefile
drivers/crypto/chelsio/chtls/chtls_cm.c
drivers/net/bonding/bond_main.c
drivers/net/dsa/microchip/ksz9477.c
drivers/net/dsa/microchip/ksz_common.c
drivers/net/dsa/microchip/ksz_common.h
drivers/net/dsa/mv88e6xxx/chip.c
drivers/net/dsa/mv88e6xxx/chip.h
drivers/net/ethernet/aquantia/atlantic/aq_hw.h
drivers/net/ethernet/aquantia/atlantic/aq_nic.c
drivers/net/ethernet/aquantia/atlantic/aq_nic.h
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.h
drivers/net/ethernet/broadcom/bnxt/bnxt.c
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
drivers/net/ethernet/broadcom/genet/bcmgenet.c
drivers/net/ethernet/cadence/macb_main.c
drivers/net/ethernet/chelsio/cxgb4/sge.c
drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
drivers/net/ethernet/freescale/enetc/enetc_pf.c
drivers/net/ethernet/freescale/fec_main.c
drivers/net/ethernet/freescale/fec_ptp.c
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
drivers/net/ethernet/hisilicon/hns3/hns3_enet.h
drivers/net/ethernet/mellanox/mlxsw/core.c
drivers/net/ethernet/neterion/vxge/vxge-main.c
drivers/net/ethernet/pensando/ionic/ionic_lif.c
drivers/net/ethernet/pensando/ionic/ionic_lif.h
drivers/net/ethernet/qlogic/qed/qed_cxt.c
drivers/net/ethernet/qlogic/qed/qed_dev.c
drivers/net/ethernet/qlogic/qed/qed_int.c
drivers/net/ethernet/qlogic/qed/qed_int.h
drivers/net/ethernet/ti/am65-cpsw-nuss.c
drivers/net/geneve.c
drivers/net/netdevsim/netdev.c
drivers/net/phy/dp83640.c
drivers/net/wireless/intel/iwlwifi/mvm/sta.c
drivers/net/xen-netfront.c
include/asm-generic/vmlinux.lds.h
include/linux/sched.h
include/linux/tcp.h
include/net/flow_offload.h
net/ax25/af_ax25.c
net/core/dev.c
net/core/flow_offload.c
net/hsr/hsr_forward.c
net/ipv4/tcp_input.c
net/ipv4/tcp_output.c
net/ipv4/udp.c
net/ipv6/udp.c
net/netfilter/nf_tables_api.c
net/nfc/nci/core.c
net/qrtr/qrtr.c
net/sched/act_ct.c
net/sched/cls_api.c
net/smc/af_smc.c
net/tipc/link.c