Skip to content
  • Linus Torvalds's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 4a251dd2
    Linus Torvalds authored
    Pull networking fixes from David Miller:
    
     1) Revert CHECKSUM_COMPLETE optimization in pskb_trim_rcsum(), I can't
        figure out why it breaks things.
    
     2) Fix comparison in netfilter ipset's hash_netnet4_data_equal(), it
        was basically doing "x == x", from Dave Jones.
    
     3) Freescale FEC driver was DMA mapping the wrong number of bytes, from
        Sebastian Siewior.
    
     4) Blackhole and prohibit routes in ipv6 were not doing the right thing
        because their ->input and ->output methods were not being assigned
        correctly.  Now they behave properly like their ipv4 counterparts.
        From Kamala R.
    
     5) Several drivers advertise the NETIF_F_FRAGLIST capability, but
        really do not support this feature and will send garbage packets if
        fed fraglist SKBs.  From Eric Dumazet.
    
     6) Fix long standing user triggerable BUG_ON over loopback in RDS
        protocol stack, from Venkat Venkatsubra.
    
     7) Several not so common code paths can potentially try to invoke
        packet scheduler actions that might be NULL without checking.  Shore
        things up by either 1) defining a method as mandatory and erroring
        on registration if that method is NULL 2) defininig a method as
        optional and the registration function hooks up a default
        implementation when NULL is seen.  From Jamal Hadi Salim.
    
     8) Fix fragment detection in xen-natback driver, from Paul Durrant.
    
     9) Kill dangling enter_memory_pressure method in cg_proto ops, from
        Eric W Biederman.
    
    10) SKBs that traverse namespaces should have their local_df cleared,
        from Hannes Frederic Sowa.
    
    11) IOCB file position is not being updated by macvtap_aio_read() and
        tun_chr_aio_read().  From Zhi Yong Wu.
    
    12) Don't free virtio_net netdev before releasing all of the NAPI
        instances.  From Andrey Vagin.
    
    13) Procfs entry leak in xt_hashlimit, from Sergey Popovich.
    
    14) IPv6 routes that are no cached routes should not count against the
        garbage collection limits.  We had this almost right, but were
        missing handling addrconf generated routes properly.  From Hannes
        Frederic Sowa.
    
    15) fib{4,6}_rule_suppress() have to consider potentially seeing NULL
        route info when they are called, from Stefan Tomanek.
    
    16) TUN and MACVTAP have had truncated packet signalling for some time,
        fix from Jason Wang.
    
    17) Fix use after frrr in __udp4_lib_rcv(), from Eric Dumazet.
    
    18) xen-netback does not interpret the NAPI budget properly for TX work,
        fix from Paul Durrant.
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (132 commits)
      igb: Fix for issue where values could be too high for udelay function.
      i40e: fix null dereference
      xen-netback: fix gso_prefix check
      net: make neigh_priv_len in struct net_device 16bit instead of 8bit
      drivers: net: cpsw: fix for cpsw crash when build as modules
      xen-netback: napi: don't prematurely request a tx event
      xen-netback: napi: fix abuse of budget
      sch_tbf: use do_div() for 64-bit divide
      udp: ipv4: must add synchronization in udp_sk_rx_dst_set()
      net:fec: remove duplicate lines in comment about errata ERR006358
      Revert "8390 : Replace ei_debug with msg_enable/NETIF_MSG_* feature"
      8390 : Replace ei_debug with msg_enable/NETIF_MSG_* feature
      xen-netback: make sure skb linear area covers checksum field
      net: smc91x: Fix device tree based configuration so it's usable
      udp: ipv4: fix potential use after free in udp_v4_early_demux()
      macvtap: signal truncated packets
      tun: unbreak truncated packet signalling
      net: sched: htb: fix the calculation of quantum
      net: sched: tbf: fix the calculation of max_size
      micrel: add support for KSZ8041RNLI
      ...
    4a251dd2