1 files changed, 15 insertions, 7 deletions

diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c
index aa61708bea69..310e0b9c2657 100644
--- a/drivers/net/geneve.c
+++ b/drivers/net/geneve.c
@@ -922,8 +922,8 @@ tx_error:
                 dev->stats.collisions++;
         else if (err == -ENETUNREACH)
                 dev->stats.tx_carrier_errors++;
-        else
-                dev->stats.tx_errors++;
+
+        dev->stats.tx_errors++;
         return NETDEV_TX_OK;
 }
 
@@ -1012,8 +1012,8 @@ tx_error:
                 dev->stats.collisions++;
         else if (err == -ENETUNREACH)
                 dev->stats.tx_carrier_errors++;
-        else
-                dev->stats.tx_errors++;
+
+        dev->stats.tx_errors++;
         return NETDEV_TX_OK;
 }
 #endif
@@ -1463,6 +1463,7 @@ struct net_device *geneve_dev_create_fb(struct net *net, const char *name,
 {
         struct nlattr *tb[IFLA_MAX + 1];
         struct net_device *dev;
+        LIST_HEAD(list_kill);
         int err;
 
         memset(tb, 0, sizeof(tb));
@@ -1474,8 +1475,10 @@ struct net_device *geneve_dev_create_fb(struct net *net, const char *name,
         err = geneve_configure(net, dev, &geneve_remote_unspec,
                                0, 0, 0, 0, htons(dst_port), true,
                                GENEVE_F_UDP_ZERO_CSUM6_RX);
-        if (err)
-                goto err;
+        if (err) {
+                free_netdev(dev);
+                return ERR_PTR(err);
+        }
 
         /* openvswitch users expect packet sizes to be unrestricted,
          * so set the largest MTU we can.
@@ -1484,10 +1487,15 @@ struct net_device *geneve_dev_create_fb(struct net *net, const char *name,
         if (err)
                 goto err;
 
+        err = rtnl_configure_link(dev, NULL);
+        if (err < 0)
+                goto err;
+
         return dev;
 
  err:
-        free_netdev(dev);
+        geneve_dellink(dev, &list_kill);
+        unregister_netdevice_many(&list_kill);
         return ERR_PTR(err);
 }
 EXPORT_SYMBOL_GPL(geneve_dev_create_fb);