tree d82bbe2467a939416ef1e8726e4305ad9e7aad4d
parent 9cc233fb0f94b79d07cf141a625e237769d267a1
parent 571e1b2c7a4c2fd5faa1648462a6b65fa26530d7
author David S. Miller <davem@davemloft.net> 1414712960 -0400
committer David S. Miller <davem@davemloft.net> 1414712960 -0400

Merge branch 'mellanox-net'

Or Gerlitz says:

====================
mlx4 driver encapsulation/steering fixes

The 1st patch fixes a bug in the TX path that supports offloading the
TX checksum of (VXLAN) encapsulated TCP packets. It turns out that the
bug is revealed only when the receiver runs in non-offloaded mode, so
we somehow missed it so far... please queue it for -stable >= 3.14

The 2nd patch makes sure not to leak steering entry on error flow,
please queue it to 3.17-stable
====================

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