Skip to content
  • Linus Torvalds's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 50dddff3
    Linus Torvalds authored
    Pull networking fixes from David Miller:
    
     1) Don't halt the firmware in r8152 driver, from Hayes Wang.
    
     2) Handle full sized 802.1ad frames in bnx2 and tg3 drivers properly,
        from Vlad Yasevich.
    
     3) Don't sleep while holding tx_clean_lock in netxen driver, fix from
        Manish Chopra.
    
     4) Certain kinds of ipv6 routes can end up endlessly failing the route
        validation test, causing it to be re-looked up over and over again.
        This particularly kills input route caching in TCP sockets.  Fix
        from Hannes Frederic Sowa.
    
     5) netvsc_start_xmit() has a use-after-free access to skb->len, fix
        from K Y Srinivasan.
    
     6) Fix matching of inverted containers in ematch module, from Ignacy
        Gawędzki.
    
     7) Aggregation of GRO frames via SKB ->frag_list for linear skbs isn't
        handled properly, regression fix from Eric Dumazet.
    
     8) Don't test return value of ipv4_neigh_lookup(), which returns an
        error pointer, against NULL.  From WANG Cong.
    
     9) Fix an old regression where we mistakenly allow a double add of the
        same tunnel.  Fixes from Steffen Klassert.
    
    10) macvtap device delete and open can run in parallel and corrupt lists
        etc., fix from Vlad Yasevich.
    
    11) Fix build error with IPV6=m NETFILTER_XT_TARGET_TPROXY=y, from Pablo
        Neira Ayuso.
    
    12) rhashtable_destroy() triggers lockdep splats, fix also from Pablo.
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (32 commits)
      bna: Update Maintainer Email
      r8152: disable power cut for RTL8153
      r8152: remove clearing bp
      bnx2: Correctly receive full sized 802.1ad fragmes
      tg3: Allow for recieve of full-size 8021AD frames
      r8152: fix setting RTL8152_UNPLUG
      netxen: Fix bug in Tx completion path.
      netxen: Fix BUG "sleeping function called from invalid context"
      ipv6: remove rt6i_genid
      hyperv: Fix a bug in netvsc_start_xmit()
      net: stmmac: fix stmmac_pci_probe failed when CONFIG_HAVE_CLK is selected
      ematch: Fix matching of inverted containers.
      gro: fix aggregation for skb using frag_list
      neigh: check error pointer instead of NULL for ipv4_neigh_lookup()
      ip6_gre: Return an error when adding an existing tunnel.
      ip6_vti: Return an error when adding an existing tunnel.
      ip6_tunnel: Return an error when adding an existing tunnel.
      ip6gre: add a rtnl link alias for ip6gretap
      net/mlx4_core: Allow not to specify probe_vf in SRIOV IB mode
      r8152: fix the carrier off when autoresuming
      ...
    50dddff3