diff options
Diffstat (limited to 'drivers/net/vxlan.c')
| -rw-r--r-- | drivers/net/vxlan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index 3a18d8ed89ca..985359dd6033 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c | |||
| @@ -1561,7 +1561,7 @@ static int vxlan6_xmit_skb(struct vxlan_sock *vs, | |||
| 1561 | 1561 | ||
| 1562 | min_headroom = LL_RESERVED_SPACE(dst->dev) + dst->header_len | 1562 | min_headroom = LL_RESERVED_SPACE(dst->dev) + dst->header_len |
| 1563 | + VXLAN_HLEN + sizeof(struct ipv6hdr) | 1563 | + VXLAN_HLEN + sizeof(struct ipv6hdr) |
| 1564 | + (vlan_tx_tag_present(skb) ? VLAN_HLEN : 0); | 1564 | + (skb_vlan_tag_present(skb) ? VLAN_HLEN : 0); |
| 1565 | 1565 | ||
| 1566 | /* Need space for new headers (invalidates iph ptr) */ | 1566 | /* Need space for new headers (invalidates iph ptr) */ |
| 1567 | err = skb_cow_head(skb, min_headroom); | 1567 | err = skb_cow_head(skb, min_headroom); |
| @@ -1607,7 +1607,7 @@ int vxlan_xmit_skb(struct vxlan_sock *vs, | |||
| 1607 | 1607 | ||
| 1608 | min_headroom = LL_RESERVED_SPACE(rt->dst.dev) + rt->dst.header_len | 1608 | min_headroom = LL_RESERVED_SPACE(rt->dst.dev) + rt->dst.header_len |
| 1609 | + VXLAN_HLEN + sizeof(struct iphdr) | 1609 | + VXLAN_HLEN + sizeof(struct iphdr) |
| 1610 | + (vlan_tx_tag_present(skb) ? VLAN_HLEN : 0); | 1610 | + (skb_vlan_tag_present(skb) ? VLAN_HLEN : 0); |
| 1611 | 1611 | ||
| 1612 | /* Need space for new headers (invalidates iph ptr) */ | 1612 | /* Need space for new headers (invalidates iph ptr) */ |
| 1613 | err = skb_cow_head(skb, min_headroom); | 1613 | err = skb_cow_head(skb, min_headroom); |