diff options
author | David S. Miller <davem@davemloft.net> | 2016-04-14 06:31:45 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-04-14 06:31:45 +0200 |
commit | 41015e89d9ea8b3d94af22bcd8582f6f3f23d9c1 (patch) | |
tree | 7871d7b3bc82603d03851b9eca958e61bc31ff0e /net/packet | |
parent | route: do not cache fib route info on local routes with oif (diff) | |
parent | fm10k: fix multi-bit VLAN update requests from VF (diff) | |
download | linux-41015e89d9ea8b3d94af22bcd8582f6f3f23d9c1.tar.xz linux-41015e89d9ea8b3d94af22bcd8582f6f3f23d9c1.zip |
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>
Diffstat (limited to 'net/packet')
0 files changed, 0 insertions, 0 deletions