projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for-linus-20160523' of git://git.infradead.org/linux-mtd
[deliverable/linux.git]
/
drivers
/
net
/
geneve.c
diff --git
a/drivers/net/geneve.c
b/drivers/net/geneve.c
index a6dc11ce497f5c328581ee3db460eb645e3a8fa5..cadefe4fdaa2aa71cfab4dc8dc0dd4b326f5745b 100644
(file)
--- a/
drivers/net/geneve.c
+++ b/
drivers/net/geneve.c
@@
-335,15
+335,15
@@
static int geneve_udp_encap_recv(struct sock *sk, struct sk_buff *skb)
/* Need Geneve and inner Ethernet header to be present */
if (unlikely(!pskb_may_pull(skb, GENEVE_BASE_HLEN)))
/* Need Geneve and inner Ethernet header to be present */
if (unlikely(!pskb_may_pull(skb, GENEVE_BASE_HLEN)))
- goto
error
;
+ goto
drop
;
/* Return packets with reserved bits set */
geneveh = geneve_hdr(skb);
if (unlikely(geneveh->ver != GENEVE_VER))
/* Return packets with reserved bits set */
geneveh = geneve_hdr(skb);
if (unlikely(geneveh->ver != GENEVE_VER))
- goto
error
;
+ goto
drop
;
if (unlikely(geneveh->proto_type != htons(ETH_P_TEB)))
if (unlikely(geneveh->proto_type != htons(ETH_P_TEB)))
- goto
error
;
+ goto
drop
;
gs = rcu_dereference_sk_user_data(sk);
if (!gs)
gs = rcu_dereference_sk_user_data(sk);
if (!gs)
@@
-366,10
+366,6
@@
drop:
/* Consume bad packet */
kfree_skb(skb);
return 0;
/* Consume bad packet */
kfree_skb(skb);
return 0;
-
-error:
- /* Let the UDP layer deal with the skb */
- return 1;
}
static struct socket *geneve_create_sock(struct net *net, bool ipv6,
}
static struct socket *geneve_create_sock(struct net *net, bool ipv6,
This page took
0.025481 seconds
and
5
git commands to generate.