Skip to content
  • Linus Torvalds's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 6b15d665
    Linus Torvalds authored
    Pull networking fixes from David Miller:
    
     1) Fix negative error code usage in ATM layer, from Stefan Hajnoczi.
    
     2) If CONFIG_SYSCTL is disabled, the default TTL is not initialized
        properly.  From Ezequiel Garcia.
    
     3) Missing spinlock init in mvneta driver, from Gregory CLEMENT.
    
     4) Missing unlocks in hwmb error paths, also from Gregory CLEMENT.
    
     5) Fix deadlock on team->lock when propagating features, from Ivan
        Vecera.
    
     6) Work around buffer offset hw bug in alx chips, from Feng Tang.
    
     7) Fix double listing of SCTP entries in sctp_diag dumps, from Xin
        Long.
    
     8) Various statistics bug fixes in mlx4 from Eric Dumazet.
    
     9) Fix some randconfig build errors wrt fou ipv6 from Arnd Bergmann.
    
    10) All of l2tp was namespace aware, but the ipv6 support code was not
        doing so.  From Shmulik Ladkani.
    
    11) Handle on-stack hrtimers properly in pktgen, from Guenter Roeck.
    
    12) Propagate MAC changes properly through VLAN devices, from Mike
        Manning.
    
    13) Fix memory leak in bnx2x_init_one(), from Vitaly Kuznetsov.
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (62 commits)
      sfc: Track RPS flow IDs per channel instead of per function
      usbnet: smsc95xx: fix link detection for disabled autonegotiation
      virtio_net: fix virtnet_open and virtnet_probe competing for try_fill_recv
      bnx2x: avoid leaking memory on bnx2x_init_one() failures
      fou: fix IPv6 Kconfig options
      openvswitch: update checksum in {push,pop}_mpls
      sctp: sctp_diag should dump sctp socket type
      net: fec: update dirty_tx even if no skb
      vlan: Propagate MAC address to VLANs
      atm: iphase: off by one in rx_pkt()
      atm: firestream: add more reserved strings
      vxlan: Accept user specified MTU value when create new vxlan link
      net: pktgen: Call destroy_hrtimer_on_stack()
      timer: Export destroy_hrtimer_on_stack()
      net: l2tp: Make l2tp_ip6 namespace aware
      Documentation: ip-sysctl.txt: clarify secure_redirects
      sfc: use flow dissector helpers for aRFS
      ieee802154: fix logic error in ieee802154_llsec_parse_dev_addr
      net: nps_enet: Disable interrupts before napi reschedule
      net/lapb: tuse %*ph to dump buffers
      ...
    6b15d665