1. 17 5月, 2016 38 次提交
  2. 16 5月, 2016 2 次提交
    • D
      Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue · f23e0f65
      David S. Miller 提交于
      Jeff Kirsher says:
      
      ====================
      40GbE Intel Wired LAN Driver Updates 2016-05-14
      
      This series contains updates to i40e and i40evf.
      
      Kevin adds support to disable link on all ports and changes bits set
      for telling firmware the PHY needs to be modified by the driver.
      
      Anjali adds a feature to enable/disable all multicast for a trusted
      VF.  Added priv-flag knob to configure global true promiscuous
      support.
      
      Shannon adds the support code for calling the admin queue API call
      aq_set_switch_config().
      
      Mitch modifies the VF, to log a message if an untrusted VF attempts to
      configure promiscuous mode, but lies to it and returns everything is ok
      instead of returning an error.  Corrects the logic for reporting the
      receive packet hash.  Fixed the adding of a broadcast filter for VFs,
      since that all VSIs are configured to receive broadcasts as default,
      so do not need to add a filter.
      
      Catherine refactors the ethtool get_settings to report the possible
      supported link modes from what we know about the current PHY type and
      that with the firmware supported PHY types.
      
      Jacob changes the driver to use WARN_ONCE in order to highlight the
      issue, but do not display a warning every time when receive hang
      message is received.
      
      Akeem corrects receive ptype payload layer for non_tunneled IPv6, when
      it should be layer 4 for UDP, instead of layer 3.
      
      Dan Carpenter fixes an uninitialized variable bug.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      f23e0f65
    • D
      Merge branch 'bnxt_en-next' · bf14e9ec
      David S. Miller 提交于
      Michael Chan says:
      
      ====================
      bnxt_en: updates for net-next.
      
      Non-critical bug fixes, improvements, a new ethtool feature, and a new
      device ID.
      
      v2: Fixed a bug in bnxt_get_module_eeprom() found by Ben Hutchings.
      
      Ajit Khaparde (2):
        bnxt_en: Add Support for ETHTOOL_GMODULEINFO and ETHTOOL_GMODULEEEPRO
        bnxt_en: Report PCIe link speed and width during driver load
      
      Michael Chan (6):
        bnxt_en: Reduce maximum ring pages if page size is 64K.
        bnxt_en: Improve the delay logic for firmware response.
        bnxt_en: Fix length value in dmesg log firmware error message.
        bnxt_en: Simplify and improve unsupported SFP+ module reporting.
        bnxt_en: Add BCM57314 device ID.
        bnxt_en: Use dma_rmb() instead of rmb().
      
      Satish Baddipadige (1):
        bnxt_en: Fix invalid max channel parameter in ethtool -l.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      bf14e9ec