1. 21 Jun, 2024 38 commits
  2. 20 Jun, 2024 2 commits
    • Jakub Kicinski's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net · a6ec08be
      Jakub Kicinski authored
      Cross-merge networking fixes after downstream PR.
      
      Conflicts:
      
      drivers/net/ethernet/broadcom/bnxt/bnxt.c
        1e796211 ("bnxt_en: Restore PTP tx_avail count in case of skb_pad() error")
        165f8769 ("bnxt_en: add timestamping statistics support")
      
      No adjacent changes.
      Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      a6ec08be
    • Linus Torvalds's avatar
      Merge tag 'net-6.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net · d5a7fc58
      Linus Torvalds authored
      Pull networking fixes from Jakub Kicinski:
       "Including fixes from wireless, bpf and netfilter.
      
        Happy summer solstice! The line count is a bit inflated by a selftest
        and update to a driver's FW interface header, in reality this is
        slightly below average for us. We are expecting one driver fix from
        Intel, but there are no big known issues.
      
        Current release - regressions:
      
         - ipv6: bring NLM_DONE out to a separate recv() again
      
        Current release - new code bugs:
      
         - wifi: cfg80211: wext: set ssids=NULL for passive scans via old wext API
      
        Previous releases - regressions:
      
         - wifi: mac80211: fix monitor channel setting with chanctx emulation
           (probably most awaited of the fixes in this PR, tracked by Thorsten)
      
         - usb: ax88179_178a: bring back reset on init, if PHY is disconnected
      
         - bpf: fix UML x86_64 compile failure with BPF
      
         - bpf: avoid splat in pskb_pull_reason(), sanity check added can be hit
           with malicious BPF
      
         - eth: mvpp2: use slab_build_skb() for packets in slab, driver was
           missed during API refactoring
      
         - wifi: iwlwifi: add missing unlock of mvm mutex
      
        Previous releases - always broken:
      
         - ipv6: add a number of missing null-checks for in6_dev_get(), in case
           IPv6 disabling races with the datapath
      
         - bpf: fix reg_set_min_max corruption of fake_reg
      
         - sched: act_ct: add netns as part of the key of tcf_ct_flow_table"
      
      * tag 'net-6.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (63 commits)
        net: usb: rtl8150 fix unintiatilzed variables in rtl8150_get_link_ksettings
        selftests: virtio_net: add forgotten config options
        bnxt_en: Restore PTP tx_avail count in case of skb_pad() error
        bnxt_en: Set TSO max segs on devices with limits
        bnxt_en: Update firmware interface to 1.10.3.44
        net: stmmac: Assign configured channel value to EXTTS event
        net: do not leave a dangling sk pointer, when socket creation fails
        net/tcp_ao: Don't leak ao_info on error-path
        ice: Fix VSI list rule with ICE_SW_LKUP_LAST type
        ipv6: bring NLM_DONE out to a separate recv() again
        selftests: add selftest for the SRv6 End.DX6 behavior with netfilter
        selftests: add selftest for the SRv6 End.DX4 behavior with netfilter
        netfilter: move the sysctl nf_hooks_lwtunnel into the netfilter core
        seg6: fix parameter passing when calling NF_HOOK() in End.DX4 and End.DX6 behaviors
        netfilter: ipset: Fix suspicious rcu_dereference_protected()
        selftests: openvswitch: Set value to nla flags.
        octeontx2-pf: Fix linking objects into multiple modules
        octeontx2-pf: Add error handling to VLAN unoffload handling
        virtio_net: fixing XDP for fully checksummed packets handling
        virtio_net: checksum offloading handling fix
        ...
      d5a7fc58