tree 7871d7b3bc82603d03851b9eca958e61bc31ff0e
parent d6d5e999e5df67f8ec20b6be45e2229455ee3699
parent f808c5dbcdc393be8e9f676c61baac6a3db382c1
author David S. Miller <davem@davemloft.net> 1460608305 -0400
committer David S. Miller <davem@davemloft.net> 1460608305 -0400

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue

Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2016-04-13

This series contains updates to i40e, i40evf and fm10k.

Alex fixes a bug introduced earlier based on his interpretation of the
XL710 datasheet.  The actual limit for fragments with TSO and a skbuff
that has payload data in the header portion of the buffer is actually
only 7 fragments and the skb-data portion counts as 2 buffers, one for
the TSO header, and the one for a segment payload buffer.

Jacob fixes a bug where in a previous refactor of the code broke
multi-bit updates for VFs.  The problem occurs because a multi-bit
request has a non-zero length, and the PF would simply drop any
request with the upper 16 bits set.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>