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:
e0897ae
)
vxlan: fix incorrect type
author
Jiri Benc
<
[email protected]
>
Mon, 11 Apr 2016 15:06:08 +0000
(17:06 +0200)
committer
David S. Miller
<
[email protected]
>
Mon, 11 Apr 2016 19:01:56 +0000
(15:01 -0400)
The protocol is 16bit, not 32bit.
Fixes: e1e5314de08ba ("vxlan: implement GPE")
Reported-by: Dan Carpenter <
[email protected]
>
Signed-off-by: Jiri Benc <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/vxlan.c
patch
|
blob
|
history
diff --git
a/drivers/net/vxlan.c
b/drivers/net/vxlan.c
index 9f3634064c921fbd212d022705a5d21b355da316..7f697a3f00a44cf6554a43c20c3803f66cf53fbf 100644
(file)
--- a/
drivers/net/vxlan.c
+++ b/
drivers/net/vxlan.c
@@
-1181,7
+1181,7
@@
out:
}
static bool vxlan_parse_gpe_hdr(struct vxlanhdr *unparsed,
- __be
32
*protocol,
+ __be
16
*protocol,
struct sk_buff *skb, u32 vxflags)
{
struct vxlanhdr_gpe *gpe = (struct vxlanhdr_gpe *)unparsed;
@@
-1284,7
+1284,7
@@
static int vxlan_rcv(struct sock *sk, struct sk_buff *skb)
struct vxlanhdr unparsed;
struct vxlan_metadata _md;
struct vxlan_metadata *md = &_md;
- __be
32
protocol = htons(ETH_P_TEB);
+ __be
16
protocol = htons(ETH_P_TEB);
bool raw_proto = false;
void *oiph;