diff options
Diffstat (limited to 'drivers/net/wireless/libertas/persistcfg.c')
-rw-r--r-- | drivers/net/wireless/libertas/persistcfg.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/libertas/persistcfg.c b/drivers/net/wireless/libertas/persistcfg.c index 18fe29faf99b..871f914a75fc 100644 --- a/drivers/net/wireless/libertas/persistcfg.c +++ b/drivers/net/wireless/libertas/persistcfg.c | |||
@@ -187,9 +187,9 @@ static ssize_t mesh_id_get(struct device *dev, struct device_attribute *attr, | |||
187 | if (ret) | 187 | if (ret) |
188 | return ret; | 188 | return ret; |
189 | 189 | ||
190 | if (defs.meshie.val.mesh_id_len > IW_ESSID_MAX_SIZE) { | 190 | if (defs.meshie.val.mesh_id_len > IEEE80211_MAX_SSID_LEN) { |
191 | lbs_pr_err("inconsistent mesh ID length"); | 191 | lbs_pr_err("inconsistent mesh ID length"); |
192 | defs.meshie.val.mesh_id_len = IW_ESSID_MAX_SIZE; | 192 | defs.meshie.val.mesh_id_len = IEEE80211_MAX_SSID_LEN; |
193 | } | 193 | } |
194 | 194 | ||
195 | /* SSID not null terminated: reserve room for \0 + \n */ | 195 | /* SSID not null terminated: reserve room for \0 + \n */ |
@@ -214,7 +214,7 @@ static ssize_t mesh_id_set(struct device *dev, struct device_attribute *attr, | |||
214 | int len; | 214 | int len; |
215 | int ret; | 215 | int ret; |
216 | 216 | ||
217 | if (count < 2 || count > IW_ESSID_MAX_SIZE + 1) | 217 | if (count < 2 || count > IEEE80211_MAX_SSID_LEN + 1) |
218 | return -EINVAL; | 218 | return -EINVAL; |
219 | 219 | ||
220 | memset(&cmd, 0, sizeof(struct cmd_ds_mesh_config)); | 220 | memset(&cmd, 0, sizeof(struct cmd_ds_mesh_config)); |
@@ -233,7 +233,7 @@ static ssize_t mesh_id_set(struct device *dev, struct device_attribute *attr, | |||
233 | /* SSID len */ | 233 | /* SSID len */ |
234 | ie->val.mesh_id_len = len; | 234 | ie->val.mesh_id_len = len; |
235 | /* IE len */ | 235 | /* IE len */ |
236 | ie->len = sizeof(struct mrvl_meshie_val) - IW_ESSID_MAX_SIZE + len; | 236 | ie->len = sizeof(struct mrvl_meshie_val) - IEEE80211_MAX_SSID_LEN + len; |
237 | 237 | ||
238 | ret = lbs_mesh_config_send(priv, &cmd, CMD_ACT_MESH_CONFIG_SET, | 238 | ret = lbs_mesh_config_send(priv, &cmd, CMD_ACT_MESH_CONFIG_SET, |
239 | CMD_TYPE_MESH_SET_MESH_IE); | 239 | CMD_TYPE_MESH_SET_MESH_IE); |