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 18:44:45 +0200 |
| commit | f132ae7c46370c981412a68ccec9f2145812a9b6 (patch) | |
| tree | 4c1371e6f9b81dbe781c10c2a7109f022ea1caec /include/net/gre.h | |
| parent | tcp: guarantee forward progress in tcp_sendmsg() (diff) | |
| download | linux-f132ae7c46370c981412a68ccec9f2145812a9b6.tar.xz 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 'include/net/gre.h')
| -rw-r--r-- | include/net/gre.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/gre.h b/include/net/gre.h index 29e37322c06e..a14093c70eab 100644 --- a/include/net/gre.h +++ b/include/net/gre.h @@ -26,7 +26,7 @@ int gre_del_protocol(const struct gre_protocol *proto, u8 version); struct net_device *gretap_fb_dev_create(struct net *net, const char *name, u8 name_assign_type); int gre_parse_header(struct sk_buff *skb, struct tnl_ptk_info *tpi, - bool *csum_err, int *hdr_len); + bool *csum_err); static inline int gre_calc_hlen(__be16 o_flags) { |