1. 05 6月, 2014 5 次提交
    • A
      xen-netfront: Factor queue-specific data into queue struct. · 2688fcb7
      Andrew J. Bennieston 提交于
      In preparation for multi-queue support in xen-netfront, move the
      queue-specific data from struct netfront_info to struct netfront_queue,
      and update the rest of the code to use this.
      
      Also adds loops over queues where appropriate, even though only one is
      configured at this point, and uses alloc_etherdev_mq() and the
      corresponding multi-queue netif wake/start/stop functions in preparation
      for multiple active queues.
      
      Finally, implements a trivial queue selection function suitable for
      ndo_select_queue, which simply returns 0, selecting the first (and
      only) queue.
      Signed-off-by: NAndrew J. Bennieston <andrew.bennieston@citrix.com>
      Acked-by: NWei Liu <wei.liu2@citrix.com>
      Reviewed-by: NDavid Vrabel <david.vrabel@citrix.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      2688fcb7
    • A
      xen-netback: Add support for multiple queues · 8d3d53b3
      Andrew J. Bennieston 提交于
      Builds on the refactoring of the previous patch to implement multiple
      queues between xen-netfront and xen-netback.
      
      Writes the maximum supported number of queues into XenStore, and reads
      the values written by the frontend to determine how many queues to use.
      
      Ring references and event channels are read from XenStore on a per-queue
      basis and rings are connected accordingly.
      
      Also adds code to handle the cleanup of any already initialised queues
      if the initialisation of a subsequent queue fails.
      Signed-off-by: NAndrew J. Bennieston <andrew.bennieston@citrix.com>
      Acked-by: NWei Liu <wei.liu2@citrix.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      8d3d53b3
    • W
      xen-netback: Factor queue-specific data into queue struct · e9ce7cb6
      Wei Liu 提交于
      In preparation for multi-queue support in xen-netback, move the
      queue-specific data from struct xenvif into struct xenvif_queue, and
      update the rest of the code to use this.
      
      Also adds loops over queues where appropriate, even though only one is
      configured at this point, and uses alloc_netdev_mq() and the
      corresponding multi-queue netif wake/start/stop functions in preparation
      for multiple active queues.
      
      Finally, implements a trivial queue selection function suitable for
      ndo_select_queue, which simply returns 0 for a single queue and uses
      skb_get_hash() to compute the queue index otherwise.
      Signed-off-by: NAndrew J. Bennieston <andrew.bennieston@citrix.com>
      Signed-off-by: NWei Liu <wei.liu2@citrix.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e9ce7cb6
    • A
      xen-netback: Move grant_copy_op array back into struct xenvif. · a55d9766
      Andrew J. Bennieston 提交于
      This array was allocated separately in commit ac3d5ac2 ("xen-netback:
      fix guest-receive-side array sizes") due to it being very large, and a
      struct xenvif is allocated as the netdev_priv part of a struct
      net_device, i.e. via kmalloc() but falling back to vmalloc() if the
      initial alloc. fails.
      
      In preparation for the multi-queue patches, where this array becomes
      part of struct xenvif_queue and is always allocated through vzalloc(),
      move this back into the struct xenvif.
      Signed-off-by: NAndrew J. Bennieston <andrew.bennieston@citrix.com>
      Acked-by: NWei Liu <wei.liu2@citrix.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      a55d9766
    • D
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next · 9bcc14d2
      David S. Miller 提交于
      Jeff Kirsher says:
      
      ====================
      Intel Wired LAN Driver Updates
      
      This series contains updates to e1000, igb and ixgbe.
      
      Emil provides his version 2 fix for the detection of SFP+ capable interfaces.
      In cases where the driver is loaded while there are no SFP+ modules in cage,
      the interface was not being detected as SFP capable.  Resolve the issue by
      identifying interfaces with no PHY type set as SFP capable which allows the
      driver to detect the SFP module when the interface is brought up.  In this
      version 2 of the patch, the 82599 specific check was removed since we only
      have 82598 devices that are SFP capable.
      
      Jacob removes the including of the export header in the ixgbe PTP core, since
      it is not needed.  Renames igb_ptp_enable() to igb_ptp_feature_enable() to
      better reflect the actual functions purpose.
      
      Todd fixes the ethtool loopback test for i354 backplane devices since we
      do not know what PHY is to be used for the devices, use MAC loopback for
      ethtool tests.  Todd also sets the packet buffer size register defaults for
      i210 devices.
      
      Yongjian Xu removes the check for skb->len being negative or zero since there
      is never a case where it would be zero or negative for e1000.
      
      Manuel Schölling updates e1000 to use the time_after() helper function.
      
      v2: Fix indentation on wrapped line in patch 3 of the series based on
          feedback from David Miller
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      9bcc14d2
  2. 04 6月, 2014 18 次提交
  3. 03 6月, 2014 17 次提交