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

Merged and Committed by Linus Torvalds 4 years ago
213 files changed. 2133 lines added. 1289 lines removed.
Documentation/networking/device_drivers/intel/e100.rst
file modified
+7 -7
Documentation/networking/device_drivers/intel/e1000.rst
file modified
+6 -6
Documentation/networking/device_drivers/intel/e1000e.rst
file modified
+7 -7
Documentation/networking/device_drivers/intel/fm10k.rst
file modified
+5 -5
Documentation/networking/device_drivers/intel/i40e.rst
file modified
+4 -4
Documentation/networking/device_drivers/intel/iavf.rst
file modified
+4 -4
Documentation/networking/device_drivers/intel/ice.rst
file modified
+3 -3
Documentation/networking/device_drivers/intel/igb.rst
file modified
+6 -6
Documentation/networking/device_drivers/intel/igbvf.rst
file modified
+3 -3
Documentation/networking/device_drivers/intel/ixgbe.rst
file modified
+5 -5
Documentation/networking/device_drivers/intel/ixgbevf.rst
file modified
+3 -3
Documentation/networking/device_drivers/pensando/ionic.rst
file modified
+3 -3
Documentation/networking/ip-sysctl.txt
file modified
+7 -4
MAINTAINERS
file modified
+0 -1
drivers/crypto/chelsio/chtls/chtls_cm.c
file modified
+1 -1
drivers/crypto/chelsio/chtls/chtls_io.c
file modified
+1 -1
drivers/isdn/capi/capi.c
file modified
+1 -1
drivers/net/bonding/bond_alb.c
file modified
+1 -1
drivers/net/bonding/bond_main.c
file modified
+9 -19
drivers/net/dsa/bcm_sf2.c
file modified
+21 -15
drivers/net/dsa/sja1105/Kconfig
file modified
+2 -2
drivers/net/ethernet/arc/emac_rockchip.c
file modified
+3 -0
drivers/net/ethernet/broadcom/bnxt/bnxt.c
file modified
+4 -6
drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c
file modified
+67 -45
drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.h
file modified
+2 -1
drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c
file modified
+16 -12
drivers/net/ethernet/chelsio/cxgb4/sge.c
file modified
+2 -6
drivers/net/ethernet/cortina/gemini.h
file modified
+1 -1
drivers/net/ethernet/faraday/ftgmac100.c
file modified
+12 -13
drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.h
file modified
+1 -1
drivers/net/ethernet/freescale/dpaa2/dprtc-cmd.h
file modified
+1 -1
drivers/net/ethernet/freescale/dpaa2/dprtc.h
file modified
+1 -1
drivers/net/ethernet/freescale/fec_main.c
file modified
+1 -1
drivers/net/ethernet/freescale/fec_ptp.c
file modified
+2 -2
drivers/net/ethernet/google/gve/gve_rx.c
file modified
+2 -0
drivers/net/ethernet/google/gve/gve_tx.c
file modified
+22 -2
drivers/net/ethernet/hisilicon/hip04_eth.c
file modified
+9 -7
drivers/net/ethernet/intel/e1000/e1000_ethtool.c
file modified
+3 -4
drivers/net/ethernet/intel/i40e/i40e_xsk.c
file modified
+0 -5
drivers/net/ethernet/intel/igb/e1000_82575.c
file modified
+1 -1
drivers/net/ethernet/intel/igb/igb_main.c
file modified
+5 -3
drivers/net/ethernet/intel/igc/igc_main.c
file modified
+2 -1
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
file modified
+0 -1
drivers/net/ethernet/marvell/mvneta_bm.h
file modified
+20 -12
drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
file modified
+26 -16
drivers/net/ethernet/mellanox/mlx5/core/en.h
file modified
+2 -1
drivers/net/ethernet/mellanox/mlx5/core/en/hv_vhca_stats.c
file modified
+2 -2
drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c
file modified
+9 -3
drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h
file modified
+6 -7
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.c
file modified
+1 -1
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.h
file modified
+25 -4
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c
file modified
+114 -76
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
file modified
+1 -1
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
file modified
+11 -2
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
file modified
+2 -2
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
file modified
+4 -1
drivers/net/ethernet/mellanox/mlx5/core/en_selftest.c
file modified
+3 -12
drivers/net/ethernet/mellanox/mlx5/core/en_stats.c
file modified
+10 -6
drivers/net/ethernet/mellanox/mlx5/core/en_stats.h
file modified
+6 -4
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
file modified
+28 -8
drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
file modified
+20 -15
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
file modified
+0 -1
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c
file modified
+16 -6
drivers/net/ethernet/mellanox/mlx5/core/fpga/conn.c
file modified
+3 -1
drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c
file modified
+2 -1
drivers/net/ethernet/mellanox/mlx5/core/health.c
file modified
+1 -1
drivers/net/ethernet/mellanox/mlxsw/core.c
file modified
+2 -2
drivers/net/ethernet/mscc/ocelot.c
file modified
+9 -2
drivers/net/ethernet/netronome/nfp/nfp_net_repr.c
file modified
+0 -18
drivers/net/ethernet/pensando/ionic/ionic_lif.c
file modified
+2 -0
drivers/net/ethernet/pensando/ionic/ionic_main.c
file modified
+2 -0
drivers/net/ethernet/qlogic/qed/qed_main.c
file modified
+21 -6
drivers/net/ethernet/qlogic/qed/qed_sriov.c
file modified
+1 -1
drivers/net/ethernet/realtek/r8169_main.c
file modified
+4 -0
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
file modified
+1 -0
drivers/net/fjes/fjes_main.c
file modified
+14 -1
drivers/net/hamradio/bpqether.c
file modified
+0 -22
drivers/net/hyperv/netvsc_drv.c
file modified
+11 -4
drivers/net/ipvlan/ipvlan_main.c
file modified
+0 -2
drivers/net/macsec.c
file modified
+0 -18
drivers/net/macvlan.c
file modified
+0 -19
drivers/net/netdevsim/dev.c
file modified
+5 -0
drivers/net/phy/phylink.c
file modified
+16 -0
drivers/net/phy/smsc.c
file modified
+1 -0
drivers/net/ppp/ppp_generic.c
file modified
+0 -2
drivers/net/team/team.c
file modified
+12 -4
drivers/net/usb/cdc_ether.c
file modified
+7 -0
drivers/net/usb/lan78xx.c
file modified
+4 -1
drivers/net/usb/r8152.c
file modified
+1 -0
drivers/net/vrf.c
file modified
+0 -1
drivers/net/vxlan.c
file modified
+50 -12
drivers/net/wimax/i2400m/op-rfkill.c
file modified
+1 -1
drivers/net/wireless/intel/iwlwifi/fw/api/scan.h
file modified
+20 -2
drivers/net/wireless/intel/iwlwifi/fw/file.h
file modified
+3 -0
drivers/net/wireless/intel/iwlwifi/iwl-csr.h
file modified
+1 -0
drivers/net/wireless/intel/iwlwifi/iwl-prph.h
file modified
+5 -0
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
file modified
+6 -0
drivers/net/wireless/intel/iwlwifi/mvm/scan.c
file modified
+32 -8
drivers/net/wireless/intel/iwlwifi/mvm/sta.c
file modified
+83 -57
drivers/net/wireless/intel/iwlwifi/pcie/drv.c
file modified
+64 -67
drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c
file modified
+25 -0
drivers/net/wireless/intersil/hostap/hostap_hw.c
file modified
+0 -25
drivers/net/wireless/mediatek/mt76/Makefile
file modified
+2 -0
drivers/net/wireless/mediatek/mt76/dma.c
file modified
+4 -2
drivers/net/wireless/mediatek/mt76/mt76.h
file modified
+4 -2
drivers/net/wireless/mediatek/mt76/mt76x2/pci.c
file modified
+2 -0
drivers/net/wireless/mediatek/mt76/pci.c
file added
+46
drivers/net/wireless/realtek/rtlwifi/pci.c
file modified
+2 -1
drivers/net/wireless/realtek/rtlwifi/ps.c
file modified
+6 -0
drivers/net/wireless/virt_wifi.c
file modified
+52 -2
drivers/nvme/host/tcp.c
file modified
+1 -1
include/linux/dynamic_debug.h
file modified
+6 -0
include/linux/filter.h
file modified
+0 -1
include/linux/gfp.h
file modified
+23 -0
include/linux/if_macvlan.h
file modified
+0 -1
include/linux/if_team.h
file modified
+1 -0
include/linux/if_vlan.h
file modified
+0 -11
include/linux/mlx5/mlx5_ifc.h
file modified
+1 -2
include/linux/netdevice.h
file modified
+27 -34
include/linux/skbuff.h
file modified
+26 -10
include/linux/socket.h
file modified
+1 -1
include/net/bonding.h
file modified
+1 -1
include/net/busy_poll.h
file modified
+3 -3
include/net/flow_dissector.h
file modified
+2 -1
include/net/fq.h
file modified
+1 -1
include/net/fq_impl.h
file modified
+2 -2
include/net/hwbm.h
file modified
+7 -3
include/net/ip.h
file modified
+2 -2
include/net/ip_vs.h
file modified
+1 -0
include/net/net_namespace.h
file modified
+1 -1
include/net/sock.h
file modified
+10 -5
include/net/vxlan.h
file modified
+1 -0
kernel/bpf/core.c
file modified
+1 -1
kernel/bpf/devmap.c
file modified
+32 -1
kernel/bpf/syscall.c
file modified
+20 -11
net/8021q/vlan.c
file modified
+0 -1
net/8021q/vlan_dev.c
file modified
+0 -33
net/atm/common.c
file modified
+1 -1
net/batman-adv/bat_iv_ogm.c
file modified
+52 -9
net/batman-adv/bat_v_ogm.c
file modified
+33 -8
net/batman-adv/hard-interface.c
file modified
+2 -0
net/batman-adv/soft-interface.c
file modified
+0 -32
net/batman-adv/types.h
file modified
+7 -0
net/bluetooth/6lowpan.c
file modified
+0 -8
net/bluetooth/af_bluetooth.c
file modified
+2 -2
net/bridge/br_device.c
file modified
+0 -8
net/bridge/netfilter/nf_conntrack_bridge.c
file modified
+1 -1
net/caif/caif_socket.c
file modified
+1 -1
net/core/datagram.c
file modified
+4 -4
net/core/dev.c
file modified
+467 -156
net/core/dev_addr_lists.c
file modified
+6 -6
net/core/ethtool.c
file modified
+3 -1
net/core/flow_dissector.c
file modified
+16 -22
net/core/lwt_bpf.c
file modified
+6 -1
net/core/net_namespace.c
file modified
+10 -8
net/core/rtnetlink.c
file modified
+9 -8
net/core/sock.c
file modified
+3 -3
net/dccp/ipv4.c
file modified
+1 -1
net/decnet/af_decnet.c
file modified
+1 -1
net/dsa/master.c
file modified
+0 -5
net/dsa/slave.c
file modified
+0 -12
net/ieee802154/6lowpan/core.c
file modified
+0 -8
net/ipv4/datagram.c
file modified
+1 -1
net/ipv4/fib_frontend.c
file modified
+1 -1
net/ipv4/inet_hashtables.c
file modified
+1 -1
net/ipv4/ip_gre.c
file modified
+2 -2
net/ipv4/ip_output.c
file modified
+6 -5
net/ipv4/tcp.c
file modified
+2 -2
net/ipv4/tcp_ipv4.c
file modified
+3 -3
net/ipv4/udp.c
file modified
+20 -9
net/ipv6/addrconf_core.c
file modified
+1 -0
net/ipv6/inet6_hashtables.c
file modified
+1 -1
net/ipv6/ip6_gre.c
file modified
+2 -2
net/ipv6/udp.c
file modified
+1 -1
net/l2tp/l2tp_eth.c
file modified
+0 -1
net/netfilter/ipvs/ip_vs_app.c
file modified
+10 -2
net/netfilter/ipvs/ip_vs_ctl.c
file modified
+11 -18
net/netfilter/ipvs/ip_vs_pe.c
file modified
+2 -1
net/netfilter/ipvs/ip_vs_sched.c
file modified
+2 -1
net/netfilter/ipvs/ip_vs_sync.c
file modified
+10 -3
net/netfilter/nf_flow_table_core.c
file modified
+2 -1
net/netfilter/nf_tables_offload.c
file modified
+1 -1
net/netfilter/nft_payload.c
file modified
+38 -0
net/netrom/af_netrom.c
file modified
+0 -23
net/nfc/llcp_sock.c
file modified
+2 -2
net/openvswitch/datapath.c
file modified
+11 -9
net/openvswitch/vport-internal_dev.c
file modified
+4 -7
net/phonet/socket.c
file modified
+2 -2
net/rose/af_rose.c
file modified
+0 -23
net/rxrpc/ar-internal.h
file modified
+1 -0
net/rxrpc/recvmsg.c
file modified
+13 -5
net/sched/cls_bpf.c
file modified
+6 -2
net/sched/sch_generic.c
file modified
+8 -11
net/sched/sch_hhf.c
file modified
+4 -4
net/sched/sch_sfb.c
file modified
+7 -6
net/sched/sch_sfq.c
file modified
+8 -6
net/sched/sch_taprio.c
file modified
+1 -1
net/sctp/socket.c
file modified
+4 -4
net/smc/af_smc.c
file modified
+10 -3
net/smc/smc_core.c
file modified
+1 -1
net/smc/smc_pnet.c
file modified
+1 -1
net/tipc/socket.c
file modified
+2 -2
net/unix/af_unix.c
file modified
+3 -3
net/vmw_vsock/af_vsock.c
file modified
+1 -1
net/wireless/chan.c
file modified
+5 -0
net/wireless/nl80211.c
file modified
+1 -1
net/wireless/util.c
file modified
+2 -1
net/xdp/xdp_umem.c
file modified
+6 -0
tools/testing/selftests/bpf/test_offload.py
file modified
+5 -0
tools/testing/selftests/bpf/test_tc_edt.sh
file modified
+1 -1
tools/testing/selftests/net/fib_tests.sh
file modified
+21 -0
tools/testing/selftests/net/l2tp.sh
file modified
+0 -0
tools/testing/selftests/net/reuseport_dualstack.c
file modified
+2 -1
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
    
    Pull networking fixes from David Miller:
    
     1) Fix free/alloc races in batmanadv, from Sven Eckelmann.
    
     2) Several leaks and other fixes in kTLS support of mlx5 driver, from
        Tariq Toukan.
    
     3) BPF devmap_hash cost calculation can overflow on 32-bit, from Toke
        Høiland-Jørgensen.
    
     4) Add an r8152 device ID, from Kazutoshi Noguchi.
    
     5) Missing include in ipv6's addrconf.c, from Ben Dooks.
    
     6) Use siphash in flow dissector, from Eric Dumazet. Attackers can
        easily infer the 32-bit secret otherwise etc.
    
     7) Several netdevice nesting depth fixes from Taehee Yoo.
    
     8) Fix several KCSAN reported errors, from Eric Dumazet. For example,
        when doing lockless skb_queue_empty() checks, and accessing
        sk_napi_id/sk_incoming_cpu lockless as well.
    
     9) Fix jumbo packet handling in RXRPC, from David Howells.
    
    10) Bump SOMAXCONN and tcp_max_syn_backlog values, from Eric Dumazet.
    
    11) Fix DMA synchronization in gve driver, from Yangchun Fu.
    
    12) Several bpf offload fixes, from Jakub Kicinski.
    
    13) Fix sk_page_frag() recursion during memory reclaim, from Tejun Heo.
    
    14) Fix ping latency during high traffic rates in hisilicon driver, from
        Jiangfent Xiao.
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (146 commits)
      net: fix installing orphaned programs
      net: cls_bpf: fix NULL deref on offload filter removal
      selftests: bpf: Skip write only files in debugfs
      selftests: net: reuseport_dualstack: fix uninitalized parameter
      r8169: fix wrong PHY ID issue with RTL8168dp
      net: dsa: bcm_sf2: Fix IMP setup for port different than 8
      net: phylink: Fix phylink_dbg() macro
      gve: Fixes DMA synchronization.
      inet: stop leaking jiffies on the wire
      ixgbe: Remove duplicate clear_bit() call
      Documentation: networking: device drivers: Remove stray asterisks
      e1000: fix memory leaks
      i40e: Fix receive buffer starvation for AF_XDP
      igb: Fix constant media auto sense switching when no cable is connected
      net: ethernet: arc: add the missed clk_disable_unprepare
      igb: Enable media autosense for the i350.
      igb/igc: Don't warn on fatal read failures when the device is removed
      tcp: increase tcp_max_syn_backlog max value
      net: increase SOMAXCONN to 4096
      netdevsim: Fix use-after-free during device dismantle
      ...
    
        
file modified
+0 -1
file modified
+1 -1
file modified
+21 -15
file modified
+14 -1
file modified
+0 -18
file modified
+0 -19
file modified
+5 -0
file modified
+16 -0
file modified
+1 -0
file modified
+12 -4
file modified
+7 -0
file modified
+4 -1
file modified
+1 -0
file modified
+0 -1
file modified
+50 -12
file modified
+1 -1
file modified
+0 -1
file modified
+23 -0
file modified
+0 -1
file modified
+1 -0
file modified
+0 -11
file modified
+27 -34
file modified
+26 -10
file modified
+1 -1
file modified
+1 -1
file modified
+3 -3
file modified
+2 -1
file modified
+1 -1
file modified
+2 -2
file modified
+7 -3
file modified
+2 -2
file modified
+1 -0
file modified
+1 -1
file modified
+10 -5
file modified
+1 -0
file modified
+1 -1
file modified
+32 -1
file modified
+20 -11
file modified
+0 -1
file modified
+0 -33
file modified
+1 -1
file modified
+52 -9
file modified
+33 -8
file modified
+7 -0
file modified
+0 -8
file modified
+2 -2
file modified
+0 -8
file modified
+1 -1
file modified
+4 -4
file modified
+467 -156
file modified
+6 -6
file modified
+3 -1
file modified
+16 -22
file modified
+6 -1
file modified
+10 -8
file modified
+9 -8
file modified
+3 -3
file modified
+1 -1
file modified
+1 -1
file modified
+0 -5
file modified
+0 -12
file modified
+1 -1
file modified
+1 -1
file modified
+1 -1
file modified
+2 -2
file modified
+6 -5
file modified
+2 -2
file modified
+3 -3
file modified
+20 -9
file modified
+1 -0
file modified
+1 -1
file modified
+2 -2
file modified
+1 -1
file modified
+0 -1
file modified
+11 -18
file modified
+38 -0
file modified
+0 -23
file modified
+2 -2
file modified
+11 -9
file modified
+2 -2
file modified
+0 -23
file modified
+1 -0
file modified
+13 -5
file modified
+6 -2
file modified
+8 -11
file modified
+4 -4
file modified
+7 -6
file modified
+8 -6
file modified
+1 -1
file modified
+4 -4
file modified
+10 -3
file modified
+1 -1
file modified
+1 -1
file modified
+2 -2
file modified
+3 -3
file modified
+1 -1
file modified
+5 -0
file modified
+1 -1
file modified
+2 -1
file modified
+6 -0