Skip to content
  • Linus Torvalds's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · c46a024e
    Linus Torvalds authored
    Pull networking fixes from David Miller:
    
     1) Various VTI tunnel (mark handling, PMTU) bug fixes from Alexander
        Duyck and Steffen Klassert.
    
     2) Revert ethtool PHY query change, it wasn't correct.  The PHY address
        selected by the driver running the PHY to MAC connection decides
        what PHY address GET ethtool operations return information from.
    
     3) Fix handling of sequence number bits for encryption IV generation in
        ESP driver, from Herbert Xu.
    
     4) UDP can return -EAGAIN when we hit a bad checksum on receive, even
        when there are other packets in the receive queue which is wrong.
        Just respect the error returned from the generic socket recv
        datagram helper.  From Eric Dumazet.
    
     5) Fix BNA driver firmware loading on big-endian systems, from Ivan
        Vecera.
    
     6) Fix regression in that we were inheriting the congestion control of
        the listening socket for new connections, the intended behavior
        always was to use the default in this case.  From Neal Cardwell.
    
     7) Fix NULL deref in brcmfmac driver, from Arend van Spriel.
    
     8) OTP parsing fix in iwlwifi from Liad Kaufman.
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (26 commits)
      vti6: Add pmtu handling to vti6_xmit.
      Revert "net: core: 'ethtool' issue with querying phy settings"
      bnx2x: Move statistics implementation into semaphores
      xen: netback: read hotplug script once at start of day.
      xen: netback: fix printf format string warning
      Revert "netfilter: ensure number of counters is >0 in do_replace()"
      net: dsa: Properly propagate errors from dsa_switch_setup_one
      tcp: fix child sockets to use system default congestion control if not set
      udp: fix behavior of wrong checksums
      sfc: free multiple Rx buffers when required
      bna: fix soft lock-up during firmware initialization failure
      bna: remove unreasonable iocpf timer start
      bna: fix firmware loading on big-endian machines
      bridge: fix br_multicast_query_expired() bug
      via-rhine: Resigning as maintainer
      brcmfmac: avoid null pointer access when brcmf_msgbuf_get_pktid() fails
      mac80211: Fix mac80211.h docbook comments
      iwlwifi: nvm: fix otp parsing in 8000 hw family
      iwlwifi: pcie: fix tracking of cmd_in_flight
      ip_vti/ip6_vti: Preserve skb->mark after rcv_cb call
      ...
    c46a024e
Loading