projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
435f3f2
)
net: ip6_gre: remove gre_hdr_len from ip6erspan_rcv
author
Lorenzo Bianconi
<
[email protected]
>
Wed, 16 Jan 2019 18:38:05 +0000
(19:38 +0100)
committer
David S. Miller
<
[email protected]
>
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 <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
net/ipv6/ip6_gre.c
patch
|
blob
|
history
diff --git
a/net/ipv6/ip6_gre.c
b/net/ipv6/ip6_gre.c
index 09d0826742f89f32fec444993f50812bbaec8366..4a1a86e9c0e98a9729df5bfccae23f50a020a5ea 100644
(file)
--- 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;
}