Merge branch 'erspan-a-couple-fixes'

Browse source

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>

...

This commit is contained in:

David S. Miller 2017-12-18 15:11:26 -05:00

parent 814a178413 d91e8db5b6

commit 0dc6905a6a

2 changed files with 8 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

6

net/ipv4/ip_gre.c

View file

6

net/ipv6/ip6_gre.c

View file