1. 10 Jan, 2016 10 commits
  2. 09 Jan, 2016 25 commits
  3. 08 Jan, 2016 5 commits
    • David S. Miller's avatar
      Merge branch '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue · 7d397214
      David S. Miller authored
      Jeff Kirsher says:
      
      ====================
      10GbE Intel Wired LAN Driver Updates 2016-01-08
      
      This series contains updates to ixgbe only.
      
      Vasu provides three fixes for ixgbe, first assigns a minimum credit to
      a traffic class to resolve a Tx hang for CEE mode configuration.  Second
      fix changes the driver to use netdev->fcoe_ddp_xid instead of our local
      IXGBE_FCOE_DDP_MAX, since it is correctly set for our different devices
      and avoids a DDP skip error on X550.  Lastly fix the PFC configuration
      to include X550 devices.
      
      Emil provides a fix for reporting the speed in ethtool by using the
      stored value in out adapter structure.  This is due to external drivers
      may end up with unknown speed when calling ethtool_get_settings().
      
      Mark fixes the handling of any outer UDP checksum, by passing the
      skb up with CHECKSUM_NONE when an outer UDP checksum is set.  This
      will cause the stack to check the checksum, also do not increment an
      error counter because we do not really know if there is an actual error.
      Ixgbe ATR was not handling IPv6 extended headers, so ATR is not being
      performed on such packets.  Fix this by skipping extended headers
      when they are present.
      
      Usha fixes an issue with X550 and getting FDMI HBA attributes when
      FCoE support is enabled.
      
      Neerav fixes an issue for X550 when FCoE and SR-IOV are enabled, which
      the hardware generates MDD events.  Resolve this by setting the expected
      values in the transmit context descriptors for FCoE/FIP frames and
      adding a flush after writing the RDLEN register.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      7d397214
    • David S. Miller's avatar
      Merge branch 'for-upstream' of... · 250fbf12
      David S. Miller authored
      Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
      
      Johan Hedberg says:
      
      ====================
      pull request: bluetooth-next 2016-01-08
      
      Here's one more bluetooth-next pull request for the 4.5 kernel:
      
       - Support for CRC check and promiscuous mode for CC2520
       - Fixes to btmrvl driver
       - New ACPI IDs for hci_bcm driver
       - Limited Discovery support for the Bluetooth mgmt interface
       - Minor other cleanups here and there
      
      Please let me know if there are any issues pulling. Thanks.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      250fbf12
    • David S. Miller's avatar
      Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue · a33ad9ac
      David S. Miller authored
      Jeff Kirsher says:
      
      ====================
      40GbE Intel Wired LAN Driver Updates 2016-01-08
      
      This series contains updates to i40e and i40evf only.
      
      Mitch adds a useful error message and return value when the VFs are being
      reset, since there is a brief window of time when the VF cannot be
      configured because they do not have a VSI to configure.  Also made a driver
      change to allow the user to specify a zero MAC address for VFs, which
      causes the existing MAC address to be removed and allows the VF to use a
      random address (like libvirt).
      
      Sowmini Varadhan from Oracle adds similar functionality/fix to i40e that
      was added to ixgbe earlier.  The fix attempts to look up the MAC address
      in the Open Firmware on systems that support it and use IDPROM on SPARC
      if no OF address is found.
      
      Anjali provides a fix the code path so that we do not call skb_set_hash()
      if the feature is disabled.
      
      Jesse removes a device ID that has never been productized and there are
      no plans to use it, so just remove it.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a33ad9ac
    • Florian Westphal's avatar
      netfilter: nft_ct: add byte/packet counter support · 48f66c90
      Florian Westphal authored
      If the accounting extension isn't present, we'll return a counter
      value of 0.
      Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
      Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
      48f66c90
    • Florian Westphal's avatar
      netfilter: nft_byteorder: provide 64bit le/be conversion · ce1e7989
      Florian Westphal authored
      Needed to convert the (64bit) conntrack counters to BE ordering.
      Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
      Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
      ce1e7989