OSDN Git Service

net: ip6_gre: remove gre_hdr_len from ip6erspan_rcv
authorLorenzo Bianconi <lorenzo.bianconi@redhat.com>
Wed, 16 Jan 2019 18:38:05 +0000 (19:38 +0100)
committerDavid S. Miller <davem@davemloft.net>
Fri, 18 Jan 2019 21:56:44 +0000 (13:56 -0800)
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>
net/ipv6/ip6_gre.c

index 09d0826..4a1a86e 100644 (file)
@@ -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;
        }