Skip to content
  • Linus Torvalds's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · eb3d3390
    Linus Torvalds authored
    Pull networking fixes from David Miller:
     "It's been a while since my last pull request so quite a few fixes have
      piled up."
    
    Indeed.
    
     1) Fix nf_{log,queue} compilation with PROC_FS disabled, from Pablo
        Neira Ayuso.
    
     2) Fix data corruption on some tg3 chips with TSO enabled, from Michael
        Chan.
    
     3) Fix double insertion of VLAN tags in be2net driver, from Sarveshwar
        Bandi.
    
     4) Don't have TCP's MD5 support pass > PAGE_SIZE page offsets in
        scatter-gather entries into the crypto layer, the crypto layer can't
        handle that.  From Eric Dumazet.
    
     5) Fix lockdep splat in 802.1Q MRP code, also from Eric Dumazet.
    
     6) Fix OOPS in netfilter log module when called from conntrack, from
        Hans Schillstrom.
    
     7) FEC driver needs to use netif_tx_{lock,unlock}_bh() rather than the
        non-BH disabling variants.  From Fabio Estevam.
    
     8) TCP GSO can generate out-of-order packets, fix from Eric Dumazet.
    
     9) vxlan driver doesn't update 'used' field of fdb entries when it
        should, from Sridhar Samudrala.
    
    10) ipv6 should use kzalloc() to allocate inet6 socket cork options,
        otherwise we can OOPS in ip6_cork_release().  From Eric Dumazet.
    
    11) Fix races in bonding set mode, from Nikolay Aleksandrov.
    
    12) Fix checksum generation regression added by "r8169: fix 8168evl
        frame padding.", from Francois Romieu.
    
    13) ip_gre can look at stale SKB data pointer, fix from Eric Dumazet.
    
    14) Fix checksum handling when GSO is enabled in bnx2x driver with
        certain chips, from Yuval Mintz.
    
    15) Fix double free in batman-adv, from Martin Hundebøll.
    
    16) Fix device startup synchronization with firmware in tg3 driver, from
        Nithin Sujit.
    
    17) perf networking dropmonitor doesn't work at all due to mixed up
        trace parameter ordering, from Ben Hutchings.
    
    18) Fix proportional rate reduction handling in tcp_ack(), from Nandita
        Dukkipati.
    
    19) IPSEC layer doesn't return an error when a valid state is detected,
        causing an OOPS.  Fix from Timo Teräs.
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (85 commits)
      be2net: bug fix on returning an invalid nic descriptor
      tcp: xps: fix reordering issues
      net: Revert unused variable changes.
      xfrm: properly handle invalid states as an error
      virtio_net: enable napi for all possible queues during open
      tcp: bug fix in proportional rate reduction.
      net: ethernet: sun: drop unused variable
      net: ethernet: korina: drop unused variable
      net: ethernet: apple: drop unused variable
      qmi_wwan: Added support for Cinterion's PLxx WWAN Interface
      perf: net_dropmonitor: Remove progress indicator
      perf: net_dropmonitor: Use bisection in symbol lookup
      perf: net_dropmonitor: Do not assume ordering of dictionaries
      perf: net_dropmonitor: Fix symbol-relative addresses
      perf: net_dropmonitor: Fix trace parameter order
      net: fec: use a more proper compatible string for MVF type device
      qlcnic: Fix updating netdev->features
      qlcnic: remove netdev->trans_start updates within the driver
      qlcnic: Return proper error codes from probe failure paths
      tg3: Update version to 3.132
      ...
    eb3d3390