1 files changed, 9 insertions, 6 deletions

diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index cf8b7f0473b3..bbac1d35ed4e 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -2392,10 +2392,6 @@ static void vxlan_setup(struct net_device *dev)
 
         eth_hw_addr_random(dev);
         ether_setup(dev);
-        if (vxlan->default_dst.remote_ip.sa.sa_family == AF_INET6)
-                dev->needed_headroom = ETH_HLEN + VXLAN6_HEADROOM;
-        else
-                dev->needed_headroom = ETH_HLEN + VXLAN_HEADROOM;
 
         dev->netdev_ops = &vxlan_netdev_ops;
         dev->destructor = free_netdev;
@@ -2640,8 +2636,11 @@ static int vxlan_dev_configure(struct net *src_net, struct net_device *dev,
                 dst->remote_ip.sa.sa_family = AF_INET;
 
         if (dst->remote_ip.sa.sa_family == AF_INET6 ||
-            vxlan->cfg.saddr.sa.sa_family == AF_INET6)
+            vxlan->cfg.saddr.sa.sa_family == AF_INET6) {
+                if (!IS_ENABLED(CONFIG_IPV6))
+                        return -EPFNOSUPPORT;
                 use_ipv6 = true;
+        }
 
         if (conf->remote_ifindex) {
                 struct net_device *lowerdev
@@ -2670,8 +2669,12 @@ static int vxlan_dev_configure(struct net *src_net, struct net_device *dev,
 
                 dev->needed_headroom = lowerdev->hard_header_len +
                                        (use_ipv6 ? VXLAN6_HEADROOM : VXLAN_HEADROOM);
-        } else if (use_ipv6)
+        } else if (use_ipv6) {
                 vxlan->flags |= VXLAN_F_IPV6;
+                dev->needed_headroom = ETH_HLEN + VXLAN6_HEADROOM;
+        } else {
+                dev->needed_headroom = ETH_HLEN + VXLAN_HEADROOM;
+        }
 
         memcpy(&vxlan->cfg, conf, sizeof(*conf));
         if (!vxlan->cfg.dst_port)