1. 19 4月, 2013 3 次提交
    • D
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next · c1cb0d3b
      David S. Miller 提交于
      Jeff Kirsher says:
      
      ====================
      This series contains updates to ixgbe only.
      
      v2- Dropped the following 2 patches from the series:
       ixgbe: Support using build_skb in the case that jumbo frames are disabled
       ixgbe: walk pci-e bus to find minimum width
      
      Ben Hutchings found a bug with Alex's patch, so that patch was dropped
      permanently.  Jacob's "walk PCIe bus" patch is being re-worked for
      a more generic solution so that other drivers can benefit.
      
      In the remaining patches...
      Alex provides a fix where we were incorrectly checking the entire frag_off
      field when we only wanted the fragment offset.  Alex also cleans up
      the check for PAGE_SIZE, since the default configuration allocates 32K
      for all buffers.
      
      Emil provides a change to the calculation of eerd so that it is consistent
      between the read and write functions by using | instead of +.
      
      Jacob adds support for displaying PCIe Gen3 link speed, which was
      previously missing from the ixgbe driver.  He also provides a patch
      to clean up ixgbe_get_bus_info_generic to call some conversion
      functions, which are used also in another patch provided by Jacob.
      Jacob modifies the driver to enable certain devices (which have an
      internal switch) to read from the physical slot rather than reading
      data from the internal switch.
      
      Don provides a couple of fixes (which are more appropriate for net-next),
      one of which resolves an issue where ixgbe was only turning on the laser
      when the adapter was up which caused issues for those who wanted to
      access the MNG firmware while the port was in a down state.  The other
      fix is for WoL when currently linked at 1G.  Lastly Don bumps the driver
      version keep the in-kernel driver up to date with the current functionality.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      c1cb0d3b
    • E
      tcp: introduce TCPSpuriousRtxHostQueues SNMP counter · 0e280af0
      Eric Dumazet 提交于
      Host queues (Qdisc + NIC) can hold packets so long that TCP can
      eventually retransmit a packet before the first transmit even left
      the host.
      
      Its not clear right now if we could avoid this in the first place :
      
      - We could arm RTO timer not at the time we enqueue packets, but
        at the time we TX complete them (tcp_wfree())
      
      - Cancel the sending of the new copy of the packet if prior one
        is still in queue.
      
      This patch adds instrumentation so that we can at least see how
      often this problem happens.
      
      TCPSpuriousRtxHostQueues SNMP counter is incremented every time
      we detect the fast clone is not yet freed in tcp_transmit_skb()
      Signed-off-by: NEric Dumazet <edumazet@google.com>
      Cc: Yuchung Cheng <ycheng@google.com>
      Cc: Neal Cardwell <ncardwell@google.com>
      Cc: Tom Herbert <therbert@google.com>
      Cc: Willem de Bruijn <willemb@google.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      0e280af0
    • F
      fec: Remove unneeded asm header files · 5a5967d8
      Fabio Estevam 提交于
      There is nothing in the driver that requires <asm/coldfire.h> and
      <asm/mcfsim.h>.
      Signed-off-by: NFabio Estevam <fabio.estevam@freescale.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      5a5967d8
  2. 18 4月, 2013 24 次提交
  3. 17 4月, 2013 13 次提交