2 files changed, 24 insertions, 21 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 */
diff --git a/drivers/net/wireless/libertas/persistcfg.c b/drivers/net/wireless/libertas/persistcfg.c
index 6d0ff8decaf7..3309a9c3cfef 100644
--- a/drivers/net/wireless/libertas/persistcfg.c
+++ b/drivers/net/wireless/libertas/persistcfg.c
@@ -48,7 +48,7 @@ static ssize_t bootflag_get(struct device *dev,
         if (ret)
                 return ret;
 
-        return snprintf(buf, 12, "0x%x\n", le32_to_cpu(defs.bootflag));
+        return snprintf(buf, 12, "%d\n", le32_to_cpu(defs.bootflag));
 }
 
 /**
@@ -63,8 +63,8 @@ static ssize_t bootflag_set(struct device *dev, struct device_attribute *attr,
         int ret;
 
         memset(&cmd, 0, sizeof(cmd));
-        ret = sscanf(buf, "%x", &datum);
-        if (ret != 1)
+        ret = sscanf(buf, "%d", &datum);
+        if ((ret != 1) || (datum > 1))
                 return -EINVAL;
 
         *((__le32 *)&cmd.data[0]) = cpu_to_le32(!!datum);
@@ -91,7 +91,7 @@ static ssize_t boottime_get(struct device *dev,
         if (ret)
                 return ret;
 
-        return snprintf(buf, 12, "0x%x\n", defs.boottime);
+        return snprintf(buf, 12, "%d\n", defs.boottime);
 }
 
 /**
@@ -106,8 +106,8 @@ static ssize_t boottime_set(struct device *dev,
         int ret;
 
         memset(&cmd, 0, sizeof(cmd));
-        ret = sscanf(buf, "%x", &datum);
-        if (ret != 1)
+        ret = sscanf(buf, "%d", &datum);
+        if ((ret != 1) || (datum > 255))
                 return -EINVAL;
 
         /* A too small boot time will result in the device booting into
@@ -143,7 +143,7 @@ static ssize_t channel_get(struct device *dev,
         if (ret)
                 return ret;
 
-        return snprintf(buf, 12, "0x%x\n", le16_to_cpu(defs.channel));
+        return snprintf(buf, 12, "%d\n", le16_to_cpu(defs.channel));
 }
 
 /**
@@ -154,11 +154,11 @@ static ssize_t channel_set(struct device *dev, struct device_attribute *attr,
 {
         struct lbs_private *priv = to_net_dev(dev)->priv;
         struct cmd_ds_mesh_config cmd;
-        uint16_t datum;
+        uint32_t datum;
         int ret;
 
         memset(&cmd, 0, sizeof(cmd));
-        ret = sscanf(buf, "%hx", &datum);
+        ret = sscanf(buf, "%d", &datum);
         if (ret != 1 || datum < 1 || datum > 11)
                 return -EINVAL;
 
@@ -274,8 +274,8 @@ static ssize_t protocol_id_set(struct device *dev,
         int ret;
 
         memset(&cmd, 0, sizeof(cmd));
-        ret = sscanf(buf, "%x", &datum);
-        if (ret != 1)
+        ret = sscanf(buf, "%d", &datum);
+        if ((ret != 1) || (datum > 255))
                 return -EINVAL;
 
         /* fetch all other Information Element parameters */
@@ -328,8 +328,8 @@ static ssize_t metric_id_set(struct device *dev, struct device_attribute *attr,
         int ret;
 
         memset(&cmd, 0, sizeof(cmd));
-        ret = sscanf(buf, "%x", &datum);
-        if (ret != 1)
+        ret = sscanf(buf, "%d", &datum);
+        if ((ret != 1) || (datum > 255))
                 return -EINVAL;
 
         /* fetch all other Information Element parameters */
@@ -382,8 +382,8 @@ static ssize_t capability_set(struct device *dev, struct device_attribute *attr,
         int ret;
 
         memset(&cmd, 0, sizeof(cmd));
-        ret = sscanf(buf, "%x", &datum);
-        if (ret != 1)
+        ret = sscanf(buf, "%d", &datum);
+        if ((ret != 1) || (datum > 255))
                 return -EINVAL;
 
         /* fetch all other Information Element parameters */