Skip to content
Commit f132ae7c authored by Jiri Benc's avatar Jiri Benc Committed by David S. Miller
Browse files

gre: change gre_parse_header to return the header length



It's easier for gre_parse_header to return the header length instead of
filing it into a parameter. That way, the callers that don't care about the
header length can just check whether the returned value is lower than zero.

In gre_err, the tunnel header must not be pulled. See commit b7f8fe25
("gre: do not pull header in ICMP error processing") for details.

This patch reduces the conflict between the mentioned commit and commit
95f5c64c ("gre: Move utility functions to common headers").

Signed-off-by: default avatarJiri Benc <jbenc@redhat.com>
Acked-by: default avatarTom Herbert <tom@herbertland.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d4011239
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment