diff options
| author |   Jiri Benc <jbenc@redhat.com> | 2016-05-13 10:48:42 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-05-16 13:37:10 -0400 |
| commit | 8be0cfa4d352167df508acd571eb19afd8a2ce93 (patch) | |
| tree | ed8ec3a913afbeb21d14ba268d6487d37c579219 | |
| parent | Merge branch 'xen-netback-control-ring' (diff) | |
| download | linux-dev-8be0cfa4d352167df508acd571eb19afd8a2ce93.tar.xz linux-dev-8be0cfa4d352167df508acd571eb19afd8a2ce93.zip | |
vxlan: set mac_header correctly in GPE mode
For VXLAN-GPE, the interface is ARPHRD_NONE, thus we need to reset
mac_header after pulling the outer header.
v2: Put the code to the existing conditional block as suggested by
Shmulik Ladkani.
Fixes: e1e5314de08b ("vxlan: implement GPE")
Signed-off-by: Jiri Benc <jbenc@redhat.com>
Reviewed-by: Shmulik Ladkani <shmulik.ladkani@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/vxlan.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index 2f29d20aa08f..25ab6bf013c4 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -1381,6 +1381,7 @@ static int vxlan_rcv(struct sock *sk, struct sk_buff *skb) if (!vxlan_set_mac(vxlan, vs, skb)) goto drop; } else { + skb_reset_mac_header(skb); skb->dev = vxlan->dev; skb->pkt_type = PACKET_HOST; } |