1. 20 Aug, 2015 35 commits
  2. 19 Aug, 2015 5 commits
    • David S. Miller's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue · def63be8
      David S. Miller authored
      Jeff Kirsher says:
      
      ====================
      Intel Wired LAN Driver Updates 2015-08-18
      
      This series contains updates to igb, e100, e1000e and ixgbe.
      
      Shota Suzuki provides a fix for a possible overflow in
      igb_set_interrupt_capability() which leads to an oops.  When changing the
      number of queues by "ethtool -L", set IGB_FLAG_QUEUE_PAIRS in the same
      manner as when initializing the igb driver.
      
      Vasily Averin provides a fix for a missing rtnl_unlock() for when we
      error out due to not being able to allocate memory for our queues.
      
      Stefan Assman provides a couple of fixes for igb/igbvf.  First changes
      the igb driver in probe to simply call igb_enable_sriov() instead of
      igb_sriov_reinit() since we are starting from scratch.  Then in igbvf,
      fix the driver where it does not clear the buffer_info->dma in all
      cases after calling dma_unmap_single(), which was found by changing the
      MTU twice.
      
      Richard Cochran implements the periodic output function using the
      programmable clock outputs available in i210 when possible, falling
      back to the target time for longer periods.
      
      Todd adds support for the Marvell PHY 1512 which is required for i354
      devices.  Then updates igb to make sure SR-IOV init uses the correct
      number of queues, since recent changes could result in the PF holding
      onto all of the queues.
      
      Alex Williamson provides a fix in the case where a guest OS does not
      support hot-unplug, so disable SR-IOV prior to unregister_netdev() to
      avoid the problem.
      
      Jia-Ju Bai provides several patches, first knocks some collecting dust
      off an old e100 driver to add a check to avoid a null pointer
      dereference.  Then cleans up a possible resource leak by releasing the
      skb buffer allocated when the e100_xmit_prepare() runs into an issue
      in the DMA mapping.  In igb, add a missing rtnl_unlock() for when we
      error out due to igb_sriov_reinit() in the igb_init_interrupt_scheme().
      Provides a e1000e fix, based on suggestions from Alex Duyck to move
      head/tail register writing to e1000_configure_tx/rx() to avoid a
      possible null pointer dereference (similar to igb driver).  Lastly,
      fix a possible memory leak in igb_probe(), where the memory shadow_vfta
      allocated by kcalloc in igb_sw_init() is not freed.
      
      Mark simplifies port-specific macros for ixgbe by eliminating explicit
      comparisons with 0 and enclose formal parameters in parens to eliminate
      the risk of an operator precedence issue.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      def63be8
    • David S. Miller's avatar
      Merge branch 'vrf-next' · 1c8aa215
      David S. Miller authored
      Nikolay Aleksandrov says:
      
      ====================
      vrf: a few simplifications and cleanups
      
      These patches remove some unnecessary checks (patches 3, 4), unnecessary
      num_slaves member and refcnt manipulations which are already done by the
      upper functions.
      ====================
      Acked-by: default avatarDavid Ahern <dsa@cumulusnetworks.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      1c8aa215
    • Nikolay Aleksandrov's avatar
      vrf: simplify the netdev notifier function · 58aa9087
      Nikolay Aleksandrov authored
      We can drop the check because if vrf_ptr is present then we must have
      the vrf device as a master and since we're running with rtnl it can't go
      away.
      Signed-off-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      58aa9087
    • Nikolay Aleksandrov's avatar
      vrf: don't check for dstats and rth in uninit path · 3a4a27d3
      Nikolay Aleksandrov authored
      dstats and rth are always present because we fail the device registration
      if they can't be allocated in vrf_init() (ndo_init) so drop the unnecessary
      checks.
      Signed-off-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      3a4a27d3
    • Nikolay Aleksandrov's avatar
      vrf: drop unused num_slaves member · db5dbec5
      Nikolay Aleksandrov authored
      slave_queue has a num_slaves member which is unused, drop it.
      Signed-off-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      db5dbec5