1 files changed, 9 insertions, 6 deletions

diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index 14d5d61cec4c..bd32ac0b4e07 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -297,9 +297,7 @@ static ssize_t lbs_rtap_set(struct device *dev,
                         lbs_add_rtap(priv);
                 }
                 priv->monitormode = monitor_mode;
-        }
-
-        else {
+        } else {
                 if (!priv->monitormode)
                         return strlen(buf);
                 priv->monitormode = 0;
@@ -1242,8 +1240,6 @@ int lbs_start_card(struct lbs_private *priv)
                 lbs_pr_err("cannot register ethX device\n");
                 goto done;
         }
-        if (device_create_file(&dev->dev, &dev_attr_lbs_rtap))
-                lbs_pr_err("cannot register lbs_rtap attribute\n");
 
         lbs_update_channel(priv);
 
@@ -1275,6 +1271,13 @@ int lbs_start_card(struct lbs_private *priv)
 
                         if (device_create_file(&dev->dev, &dev_attr_lbs_mesh))
                                 lbs_pr_err("cannot register lbs_mesh attribute\n");
+
+                        /* While rtap isn't related to mesh, only mesh-enabled
+                         * firmware implements the rtap functionality via
+                         * CMD_802_11_MONITOR_MODE.
+                         */
+                        if (device_create_file(&dev->dev, &dev_attr_lbs_rtap))
+                                lbs_pr_err("cannot register lbs_rtap attribute\n");
                 }
         }
 
@@ -1306,9 +1309,9 @@ void lbs_stop_card(struct lbs_private *priv)
         netif_carrier_off(priv->dev);
 
         lbs_debugfs_remove_one(priv);
-        device_remove_file(&dev->dev, &dev_attr_lbs_rtap);
         if (priv->mesh_tlv) {
                 device_remove_file(&dev->dev, &dev_attr_lbs_mesh);
+                device_remove_file(&dev->dev, &dev_attr_lbs_rtap);
         }
 
         /* Flush pending command nodes */