Merge branch 'erspan-a-couple-fixes'
commit0dc6905a6a99cc3f09de7e7b008c52d37c0a273f
authorDavid S. Miller <davem@davemloft.net>
Mon, 18 Dec 2017 20:11:26 +0000 (18 15:11 -0500)
committerDavid S. Miller <davem@davemloft.net>
Mon, 18 Dec 2017 20:11:26 +0000 (18 15:11 -0500)
treededc322d3566dac8300b68c3fda955a61006ab58
parent814a17841325643e2d08984d076f976a0b423872
parentd91e8db5b629a3c8c81db4dc317a66c7b5591821
Merge branch 'erspan-a-couple-fixes'

William Tu says:

====================
net: erspan: a couple fixes

Haishuang Yan reports a couple of issues (wrong return value,
pskb_may_pull) on erspan V1.  Since erspan V2 is in net-next,
this series fix the similar issues on v2.
====================

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