Skip to content
Snippets Groups Projects
  • Linus Torvalds's avatar
    4a21185c
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net · 4a21185c
    Linus Torvalds authored
    Pull networking fixes from David Miller:
    
     1) Don't insert ESP trailer twice in IPSEC code, from Huy Nguyen.
    
     2) The default crypto algorithm selection in Kconfig for IPSEC is out
        of touch with modern reality, fix this up. From Eric Biggers.
    
     3) bpftool is missing an entry for BPF_MAP_TYPE_RINGBUF, from Andrii
        Nakryiko.
    
     4) Missing init of ->frame_sz in xdp_convert_zc_to_xdp_frame(), from
        Hangbin Liu.
    
     5) Adjust packet alignment handling in ax88179_178a driver to match
        what the hardware actually does. From Jeremy Kerr.
    
     6) register_netdevice can leak in the case one of the notifiers fail,
        from Yang Yingliang.
    
     7) Use after free in ip_tunnel_lookup(), from Taehee Yoo.
    
     8) VLAN checks in sja1105 DSA driver need adjustments, from Vladimir
        Oltean.
    
     9) tg3 driver can sleep forever when we get enough EEH errors, fix from
        David Christensen.
    
    10) Missing {READ,WRITE}_ONCE() annotations in various Intel ethernet
        drivers, from Ciara Loftus.
    
    11) Fix scanning loop break condition in of_mdiobus_register(), from
        Florian Fainelli.
    
    12) MTU limit is incorrect in ibmveth driver, from Thomas Falcon.
    
    13) Endianness fix in mlxsw, from Ido Schimmel.
    
    14) Use after free in smsc95xx usbnet driver, from Tuomas Tynkkynen.
    
    15) Missing bridge mrp configuration validation, from Horatiu Vultur.
    
    16) Fix circular netns references in wireguard, from Jason A. Donenfeld.
    
    17) PTP initialization on recovery is not done properly in qed driver,
        from Alexander Lobakin.
    
    18) Endian conversion of L4 ports in filters of cxgb4 driver is wrong,
        from Rahul Lakkireddy.
    
    19) Don't clear bound device TX queue of socket prematurely otherwise we
        get problems with ktls hw offloading, from Tariq Toukan.
    
    20) ipset can do atomics on unaligned memory, fix from Russell King.
    
    21) Align ethernet addresses properly in bridging code, from Thomas
        Martitz.
    
    22) Don't advertise ipv4 addresses on SCTP sockets having ipv6only set,
        from Marcelo Ricardo Leitner.
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (149 commits)
      rds: transport module should be auto loaded when transport is set
      sch_cake: fix a few style nits
      sch_cake: don't call diffserv parsing code when it is not needed
      sch_cake: don't try to reallocate or unshare skb unconditionally
      ethtool: fix error handling in linkstate_prepare_data()
      wil6210: account for napi_gro_receive never returning GRO_DROP
      hns: do not cast return value of napi_gro_receive to null
      socionext: account for napi_gro_receive never returning GRO_DROP
      wireguard: receive: account for napi_gro_receive never returning GRO_DROP
      vxlan: fix last fdb index during dump of fdb with nhid
      sctp: Don't advertise IPv4 addresses if ipv6only is set on the socket
      tc-testing: avoid action cookies with odd length.
      bpf: tcp: bpf_cubic: fix spurious HYSTART_DELAY exit upon drop in min RTT
      tcp_cubic: fix spurious HYSTART_DELAY exit upon drop in min RTT
      net: dsa: sja1105: fix tc-gate schedule with single element
      net: dsa: sja1105: recalculate gating subschedule after deleting tc-gate rules
      net: dsa: sja1105: unconditionally free old gating config
      net: dsa: sja1105: move sja1105_compose_gating_subschedule at the top
      net: macb: free resources on failure path of at91ether_open()
      net: macb: call pm_runtime_put_sync on failure path
      ...
    4a21185c
    History
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
    Linus Torvalds authored
    Pull networking fixes from David Miller:
    
     1) Don't insert ESP trailer twice in IPSEC code, from Huy Nguyen.
    
     2) The default crypto algorithm selection in Kconfig for IPSEC is out
        of touch with modern reality, fix this up. From Eric Biggers.
    
     3) bpftool is missing an entry for BPF_MAP_TYPE_RINGBUF, from Andrii
        Nakryiko.
    
     4) Missing init of ->frame_sz in xdp_convert_zc_to_xdp_frame(), from
        Hangbin Liu.
    
     5) Adjust packet alignment handling in ax88179_178a driver to match
        what the hardware actually does. From Jeremy Kerr.
    
     6) register_netdevice can leak in the case one of the notifiers fail,
        from Yang Yingliang.
    
     7) Use after free in ip_tunnel_lookup(), from Taehee Yoo.
    
     8) VLAN checks in sja1105 DSA driver need adjustments, from Vladimir
        Oltean.
    
     9) tg3 driver can sleep forever when we get enough EEH errors, fix from
        David Christensen.
    
    10) Missing {READ,WRITE}_ONCE() annotations in various Intel ethernet
        drivers, from Ciara Loftus.
    
    11) Fix scanning loop break condition in of_mdiobus_register(), from
        Florian Fainelli.
    
    12) MTU limit is incorrect in ibmveth driver, from Thomas Falcon.
    
    13) Endianness fix in mlxsw, from Ido Schimmel.
    
    14) Use after free in smsc95xx usbnet driver, from Tuomas Tynkkynen.
    
    15) Missing bridge mrp configuration validation, from Horatiu Vultur.
    
    16) Fix circular netns references in wireguard, from Jason A. Donenfeld.
    
    17) PTP initialization on recovery is not done properly in qed driver,
        from Alexander Lobakin.
    
    18) Endian conversion of L4 ports in filters of cxgb4 driver is wrong,
        from Rahul Lakkireddy.
    
    19) Don't clear bound device TX queue of socket prematurely otherwise we
        get problems with ktls hw offloading, from Tariq Toukan.
    
    20) ipset can do atomics on unaligned memory, fix from Russell King.
    
    21) Align ethernet addresses properly in bridging code, from Thomas
        Martitz.
    
    22) Don't advertise ipv4 addresses on SCTP sockets having ipv6only set,
        from Marcelo Ricardo Leitner.
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (149 commits)
      rds: transport module should be auto loaded when transport is set
      sch_cake: fix a few style nits
      sch_cake: don't call diffserv parsing code when it is not needed
      sch_cake: don't try to reallocate or unshare skb unconditionally
      ethtool: fix error handling in linkstate_prepare_data()
      wil6210: account for napi_gro_receive never returning GRO_DROP
      hns: do not cast return value of napi_gro_receive to null
      socionext: account for napi_gro_receive never returning GRO_DROP
      wireguard: receive: account for napi_gro_receive never returning GRO_DROP
      vxlan: fix last fdb index during dump of fdb with nhid
      sctp: Don't advertise IPv4 addresses if ipv6only is set on the socket
      tc-testing: avoid action cookies with odd length.
      bpf: tcp: bpf_cubic: fix spurious HYSTART_DELAY exit upon drop in min RTT
      tcp_cubic: fix spurious HYSTART_DELAY exit upon drop in min RTT
      net: dsa: sja1105: fix tc-gate schedule with single element
      net: dsa: sja1105: recalculate gating subschedule after deleting tc-gate rules
      net: dsa: sja1105: unconditionally free old gating config
      net: dsa: sja1105: move sja1105_compose_gating_subschedule at the top
      net: macb: free resources on failure path of at91ether_open()
      net: macb: call pm_runtime_put_sync on failure path
      ...