Skip to content
  • Linus Torvalds's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 433ab34d
    Linus Torvalds authored
    Pull networking fixes from David Miller:
     "Here are some bug fixes that have piled up during ksummit/linuxcon.
    
       1) Fix endian problems in ibmveth, from Anton Blanchard.
    
       2) IPV6 routing code does GFP_KERNEL allocation in atomic, fix from
          Benjamin Block.
    
       3) SCTP association fixes from Daniel Borkmann.
    
       4) When multiple VLAN headers are present we have to make sure the
          second and subsequent ones are pullable in the SKB otherwise we
          blindly dereference garbage.  From Jiri Benc.
    
       5) The argument adjustment of the signature of hlist_add_after*()
          introduced a regression in the batman-adv code, fix from Sven
          Eckelmann.
    
       6) Fix TX hang handling to avoid a panic in i40e, from Anjali Singhai
          Jain.
    
       7) PTP flag test is inverted in i40e driver, from Jesse Brandeburg.
    
       8) ATM LEC driver needs to hold RTNL mutex over MTU changes, from
          Chas Williams.
    
       9) Truncate packets larger then the TPACKET_V3 format configured
          buffers, otherwise we overwrite past the end of said buffers.
          From Eric Dumazet.
    
      10) Fix endianness bugs in qlcnic firmware handling, from Rajesh
          Borundia and Shahed Shaikh.
    
      11) CXGB4 sometimes doesn't get all of the TX completion events it
          should resulting in SKBs getting stuck in the TX queue, from
          Hariprasad Shenai.
    
      12) When the FEC chip's PTP clock is disabled, you can't access the
          register.  Add necessary checks to avoid the resulting hang, from
          Fugang Duan"
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (37 commits)
      drivers: isdn: eicon: xdi_msg.h: Fix typo in #ifndef
      net: sctp: fix suboptimal edge-case on non-active active/retrans path selection
      net: sctp: spare unnecessary comparison in sctp_trans_elect_best
      net: ethernet: broadcom: bnx2x: Remove redundant #ifdef
      ibmveth: Fix endian issues with rx_no_buffer statistic
      net: xgene: fix possible NULL dereference in xgene_enet_free_desc_rings()
      openvswitch: fix panic with multiple vlan headers
      net: ipv6: fib: don't sleep inside atomic lock
      net: fec: ptp: avoid register access when ipg clock is disabled
      cxgb4: Free completed tx skbs promptly
      cxgb4: Fix race condition in cleanup
      sctp: not send SCTP_PEER_ADDR_CHANGE notifications with failed probe
      bnx2x: Revert UNDI flushing mechanism
      qlcnic: Fix endianess issue in firmware load from file operation
      qlcnic: Fix endianess issue in FW dump template header
      qlcnic: Fix flash access interface to application
      MAINTAINERS: Add section for MRF24J40 IEEE 802.15.4 radio driver
      macvlan: Allow setting multicast filter on all macvlan types
      packet: handle too big packets for PACKET_V3
      MAINTAINERS: add entry for ec_bhf driver
      ...
    433ab34d