From: Jiri Benc <jb...@redhat.com> Date: Wed, 11 May 2016 15:53:57 +0200
> For ipgre interface in collect metadata mode, it doesn't make sense for the > interface to be of ARPHRD_IPGRE type. The outer header of received packets > is not needed, as all the information from it is present in metadata_dst. We > already don't set ipgre_header_ops for collect metadata interfaces, which is > the only consumer of mac_header pointing to the outer IP header. > > Just set the interface type to ARPHRD_NONE in collect metadata mode for > ipgre (not gretap, that still correctly stays ARPHRD_ETHER) and reset > mac_header. > > Fixes: a64b04d86d14 ("gre: do not assign header_ops in collect metadata mode") > Fixes: 2e15ea390e6f4 ("ip_gre: Add support to collect tunnel metadata.") > Signed-off-by: Jiri Benc <jb...@redhat.com> Applied, thanks Jiri.