1. 23 10月, 2013 2 次提交
    • D
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next · 666d1008
      David S. Miller 提交于
      Jeff Kirsher says:
      
      ====================
      Intel Wired LAN Driver Updates
      
      This series contains updates to i40e only.
      
      Jesse provides 6 patches against i40e.  First is a patch to reduce
      CPU utilization by reducing read-flush to read in the hot path.  Next
      couple of patches resolve coverity issues reported by Hannes Frederic
      Sowa <hannes@stressinduktion.org>.  Then Jesse refactored i40e to cleanup
      functions which used cpu_to_xxx(foo) which caused a lot of line wrapping.
      
      Mitch provides 2 i40e patches.  First fixes a panic when tx_rings[0]
      are not allocated, his second patch corrects a math error when
      assigning MSI-X vectors to VFs.  The vectors-per-vf value reported
      by the hardware already conveniently reports one less than the actual
      value.
      
      Shannon provides 5 patches against i40e.  His first patch corrects a
      number of little bugs in the error handling of irq setup, most of
      which ended up panicing the kernel.  Next he fixes the overactive
      IRQ issue seen in testing and allows the use of the legacy interrupt.
      Shannon then provides a cleanup of the arguments declared at the
      beginning of each function.  Then he provides a patch to make sure
      that there are really rings and queues before trying to dump
      information in them.  Lastly he simplifies the code by using an
      already existing variable.
      
      Catherine provides an i40e patch to bump the version.
      
      v2:
       - Remove unneeded parenthesis in patch 3 based on feedback from
         Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
       - Fix patch description for patch 11 based on feedback from
         Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      666d1008
    • Z
      net: remove function sk_reset_txq() · 0a6957e7
      ZHAO Gang 提交于
      What sk_reset_txq() does is just calls function sk_tx_queue_reset(),
      and sk_reset_txq() is used only in sock.h, by dst_negative_advice().
      Let dst_negative_advice() calls sk_tx_queue_reset() directly so we
      can remove unneeded sk_reset_txq().
      Signed-off-by: NZHAO Gang <gamerh2o@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      0a6957e7
  2. 22 10月, 2013 38 次提交