summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-01-08 17:44:21 (GMT)
committerDavid S. Miller <davem@davemloft.net>2016-01-08 17:44:21 (GMT)
commita33ad9ac818ecd36fdaa3ad1f9c5471398f41647 (patch)
tree2bda61f97e746a907c5ae906242ee3cb42cd71b6 /net
parent24759daa018f0fc8cccebc89d3dee0953e73785a (diff)
parent56028154caafab34063324916095618b2cd30c73 (diff)
downloadlinux-a33ad9ac818ecd36fdaa3ad1f9c5471398f41647.tar.xz
Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue
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: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions