Skip to content
  • Linus Torvalds's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 23f347ef
    Linus Torvalds authored
    Pull networking updates from David Miller:
    
     1) Fix inaccuracies in network driver interface documentation, from Ben
        Hutchings.
    
     2) Fix handling of negative offsets in BPF JITs, from Jan Seiffert.
    
     3) Compile warning, locking, and refcounting fixes in netfilter's
        xt_CT, from Pablo Neira Ayuso.
    
     4) phonet sendmsg needs to validate user length just like any other
        datagram protocol, fix from Sasha Levin.
    
     5) Ipv6 multicast code uses wrong loop index, from RongQing Li.
    
     6) Link handling and firmware fixes in bnx2x driver from Yaniv Rosner
        and Yuval Mintz.
    
     7) mlx4 erroneously allocates 4 pages at a time, regardless of page
        size, fix from Thadeu Lima de Souza Cascardo.
    
     8) SCTP socket option wasn't extended in a backwards compatible way,
        fix from Thomas Graf.
    
     9) Add missing address change event emissions to bonding, from Shlomo
        Pongratz.
    
    10) /proc/net/dev regressed because it uses a private offset to track
        where we are in the hash table, but this doesn't track the offset
        pullback that the seq_file code does resulting in some entries being
        missed in large dumps.
    
        Fix from Eric Dumazet.
    
    11) do_tcp_sendpage() unloads the send queue way too fast, because it
        invokes tcp_push() when it shouldn't.  Let the natural sequence
        generated by the splice paths, and the assosciated MSG_MORE
        settings, guide the tcp_push() calls.
    
        Otherwise what goes out of TCP is spaghetti and doesn't batch
        effectively into GSO/TSO clusters.
    
        From Eric Dumazet.
    
    12) Once we put a SKB into either the netlink receiver's queue or a
        socket error queue, it can be consumed and freed up, therefore we
        cannot touch it after queueing it like that.
    
        Fixes from Eric Dumazet.
    
    13) PPP has this annoying behavior in that for every transmit call it
        immediately stops the TX queue, then calls down into the next layer
        to transmit the PPP frame.
    
        But if that next layer can take it immediately, it just un-stops the
        TX queue right before returning from the transmit method.
    
        Besides being useless work, it makes several facilities unusable, in
        particular things like the equalizers.  Well behaved devices should
        only stop the TX queue when they really are full, and in PPP's case
        when it gets backlogged to the downstream device.
    
        David Woodhouse therefore fixed PPP to not stop the TX queue until
        it's downstream can't take data any more.
    
    14) IFF_UNICAST_FLT got accidently lost in some recent stmmac driver
        changes, re-add.  From Marc Kleine-Budde.
    
    15) Fix link flaps in ixgbe, from Eric W. Multanen.
    
    16) Descriptor writeback fixes in e1000e from Matthew Vick.
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (47 commits)
      net: fix a race in sock_queue_err_skb()
      netlink: fix races after skb queueing
      doc, net: Update ndo_start_xmit return type and values
      doc, net: Remove instruction to set net_device::trans_start
      doc, net: Update netdev operation names
      doc, net: Update documentation of synchronisation for TX multiqueue
      doc, net: Remove obsolete reference to dev->poll
      ethtool: Remove exception to the requirement of holding RTNL lock
      MAINTAINERS: update for Marvell Ethernet drivers
      bonding: properly unset current_arp_slave on slave link up
      phonet: Check input from user before allocating
      tcp: tcp_sendpages() should call tcp_push() once
      ipv6: fix array index in ip6_mc_add_src()
      mlx4: allocate just enough pages instead of always 4 pages
      stmmac: re-add IFF_UNICAST_FLT for dwmac1000
      bnx2x: Clear MDC/MDIO warning message
      bnx2x: Fix BCM57711+BCM84823 link issue
      bnx2x: Clear BCM84833 LED after fan failure
      bnx2x: Fix BCM84833 PHY FW version presentation
      bnx2x: Fix link issue for BCM8727 boards.
      ...
    23f347ef