1. 15 4月, 2015 25 次提交
  2. 14 4月, 2015 13 次提交
  3. 13 4月, 2015 2 次提交
    • D
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue · e60a9de4
      David S. Miller 提交于
      Jeff Kirsher says:
      
      ====================
      Intel Wired LAN Driver Updates 2015-04-11
      
      This series contains updates to iflink, ixgbe and ixgbevf.
      
      The entire set of changes come from Vlad Zolotarov to ultimately add
      the ethtool ops to VF driver to allow querying the RSS indirection table
      and RSS random key.
      
      Currently we support only 82599 and x540 devices.  On those devices, VFs
      share the RSS redirection table and hash key with a PF.  Letting the VF
      query this information may introduce some security risks, therefore this
      feature will be disabled by default.
      
      The new netdev op allows a system administrator to change the default
      behaviour with "ip link set" command.  The relevant iproute2 patch has
      already been sent and awaits for this series upstream.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e60a9de4
    • D
      Merge branch 'fou-next' · 1ceb0b8c
      David S. Miller 提交于
      Cong Wang says:
      
      ====================
      fou: some fixes and updates
      
      Patch 1~3 fix some minor bugs in net/ipv4/fou.c, the only
      thing I am not sure is if it's too late to change the
      byte order of FOU_ATTR_PORT, if so we have to fix iproute2
      instead of kernel.
      
      Patch 4~5 add some new features to make it complete.
      
      v2: make fou->port be16 too
      ====================
      Acked-by: NTom Herbert <tom@herbertland.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      1ceb0b8c