Merge branch 'erspan-always-reports-output-key-to-userspace'

Browse source

Lorenzo Bianconi says:

====================
erspan: always reports output key to userspace

Erspan protocol relies on output key to set session id header field.
However TUNNEL_KEY bit is cleared in order to not add key field to
the external GRE header and so the configured o_key is not reported
to userspace.
Fix the issue adding TUNNEL_KEY bit to the o_flags parameter dumping
device info
====================

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

...

This commit is contained in:

David S. Miller 2019-01-30 14:00:02 -08:00

parent e15aa3b2b1 c706863bc8

commit 41ef81be79

2 changed files with 12 additions and 2 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

7

net/ipv4/ip_gre.c

View file

7

net/ipv6/ip6_gre.c

View file