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/ipv4/gre_demux.c | |
| parent | d4011239f46ac6e407af61e3f74d1e3874fc9394 (diff) | |
| download | op-kernel-dev-f132ae7c46370c981412a68ccec9f2145812a9b6.zip op-kernel-dev-f132ae7c46370c981412a68ccec9f2145812a9b6.tar.gz | |
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/ipv4/gre_demux.c')
| -rw-r--r-- | net/ipv4/gre_demux.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/gre_demux.c b/net/ipv4/gre_demux.c index 37167480..a41e73a 100644 --- a/net/ipv4/gre_demux.c +++ b/net/ipv4/gre_demux.c @@ -60,8 +60,9 @@ int gre_del_protocol(const struct gre_protocol *proto, u8 version) } EXPORT_SYMBOL_GPL(gre_del_protocol); +/* Fills in tpi and returns header length to be pulled. */ int gre_parse_header(struct sk_buff *skb, struct tnl_ptk_info *tpi, - bool *csum_err, int *ret_hdr_len) + bool *csum_err) { const struct gre_base_hdr *greh; __be32 *options; @@ -119,8 +120,7 @@ int gre_parse_header(struct sk_buff *skb, struct tnl_ptk_info *tpi, return -EINVAL; } } - *ret_hdr_len = hdr_len; - return 0; + return hdr_len; } EXPORT_SYMBOL(gre_parse_header); |
