Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a057fed3 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by David S. Miller
Browse files

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: default avatarLorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 435f3f26

net/ipv6/ip6_gre.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

	}