diff options
| author |   Lorenzo Bianconi <lorenzo.bianconi@redhat.com> | 2019-01-16 19:38:05 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-01-18 13:56:44 -0800 |
| commit | a057fed33beeb1c31e7a4dc28abb8c9b4061351f (patch) | |
| tree | 7cd72f61913062fdd8194d1e480f9f6a6759e365 /net/ipv6/ip6_gre.c | |
| parent | Merge branch 'tcp_openreq_child' (diff) | |
| download | linux-dev-a057fed33beeb1c31e7a4dc28abb8c9b4061351f.tar.xz linux-dev-a057fed33beeb1c31e7a4dc28abb8c9b4061351f.zip | |
net: ip6_gre: remove gre_hdr_len from ip6erspan_rcv
Remove gre_hdr_len from ip6erspan_rcv routine signature since
it is not longer used
Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index 09d0826742f8..4a1a86e9c0e9 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -524,7 +524,7 @@ static int ip6gre_rcv(struct sk_buff *skb, const struct tnl_ptk_info *tpi) return PACKET_REJECT; } -static int ip6erspan_rcv(struct sk_buff *skb, int gre_hdr_len, +static int ip6erspan_rcv(struct sk_buff *skb, struct tnl_ptk_info *tpi) { struct erspan_base_hdr *ershdr; @@ -611,7 +611,7 @@ static int gre_rcv(struct sk_buff *skb) if (unlikely(tpi.proto == htons(ETH_P_ERSPAN) || tpi.proto == htons(ETH_P_ERSPAN2))) { - if (ip6erspan_rcv(skb, hdr_len, &tpi) == PACKET_RCVD) + if (ip6erspan_rcv(skb, &tpi) == PACKET_RCVD) return 0; goto out; } |