diff options
| author | Jiri Benc <jbenc@redhat.com> | 2016-05-03 15:00:21 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-04 12:44:45 -0400 |
| commit | f132ae7c46370c981412a68ccec9f2145812a9b6 (patch) | |
| tree | 4c1371e6f9b81dbe781c10c2a7109f022ea1caec /net/ipv6/ip6_gre.c | |
| parent | d4011239f46ac6e407af61e3f74d1e3874fc9394 (diff) | |
| download | linux-f132ae7c46370c981412a68ccec9f2145812a9b6.tar.gz linux-f132ae7c46370c981412a68ccec9f2145812a9b6.tar.bz2 linux-f132ae7c46370c981412a68ccec9f2145812a9b6.zip | |
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 b7f8fe251e46
("gre: do not pull header in ICMP error processing") for details.
This patch reduces the conflict between the mentioned commit and commit
95f5c64c3c13 ("gre: Move utility functions to common headers").
Signed-off-by: Jiri Benc <jbenc@redhat.com>
Acked-by: Tom Herbert <tom@herbertland.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_gre.c')
| -rw-r--r-- | net/ipv6/ip6_gre.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index 10127741a60d..47b671a46dc4 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -468,7 +468,8 @@ static int gre_rcv(struct sk_buff *skb) bool csum_err = false; int hdr_len; - if (gre_parse_header(skb, &tpi, &csum_err, &hdr_len) < 0) + hdr_len = gre_parse_header(skb, &tpi, &csum_err); + if (hdr_len < 0) goto drop; if (iptunnel_pull_header(skb, hdr_len, tpi.proto, false)) |