leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libertas: change IW_ESSID_MAX_SIZE -> IEEE80211_MAX_SSID_LEN

Browse Source 
Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Acked-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Holger Schurig 2009-10-22 15:30:47 +02:00 committed by John W. Linville
parent f4228b4c2e
commit 243e84e91e
9 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/wireless/libertas/assoc.c
View File

@ -226,7 +226,7 @@ static int lbs_assoc_post(struct lbs_private *priv,
priv->connect_status = LBS_CONNECTED; priv->connect_status = LBS_CONNECTED;
/* Update current SSID and BSSID */ /* Update current SSID and BSSID */
memcpy(&priv->curbssparams.ssid, &bss->ssid, IW_ESSID_MAX_SIZE); memcpy(&priv->curbssparams.ssid, &bss->ssid, IEEE80211_MAX_SSID_LEN);
priv->curbssparams.ssid_len = bss->ssid_len; priv->curbssparams.ssid_len = bss->ssid_len;
memcpy(priv->curbssparams.bssid, bss->bssid, ETH_ALEN); memcpy(priv->curbssparams.bssid, bss->bssid, ETH_ALEN);
@ -467,7 +467,7 @@ static int lbs_adhoc_post(struct lbs_private *priv,
memcpy(&priv->curbssparams.bssid, bss->bssid, ETH_ALEN); memcpy(&priv->curbssparams.bssid, bss->bssid, ETH_ALEN);
/* Set the new SSID to current SSID */ /* Set the new SSID to current SSID */
memcpy(&priv->curbssparams.ssid, &bss->ssid, IW_ESSID_MAX_SIZE); memcpy(&priv->curbssparams.ssid, &bss->ssid, IEEE80211_MAX_SSID_LEN);
priv->curbssparams.ssid_len = bss->ssid_len; priv->curbssparams.ssid_len = bss->ssid_len;
netif_carrier_on(priv->dev); netif_carrier_on(priv->dev);
@ -1083,7 +1083,7 @@ static int assoc_helper_essid(struct lbs_private *priv,
/* else send START command */ /* else send START command */
lbs_deb_assoc("SSID not found, creating adhoc network\n"); lbs_deb_assoc("SSID not found, creating adhoc network\n");
memcpy(&assoc_req->bss.ssid, &assoc_req->ssid, memcpy(&assoc_req->bss.ssid, &assoc_req->ssid,
IW_ESSID_MAX_SIZE); IEEE80211_MAX_SSID_LEN);
assoc_req->bss.ssid_len = assoc_req->ssid_len; assoc_req->bss.ssid_len = assoc_req->ssid_len;
lbs_adhoc_start(priv, assoc_req); lbs_adhoc_start(priv, assoc_req);
} }
@ -1541,7 +1541,7 @@ static int lbs_find_best_network_ssid(struct lbs_private *priv,
found = lbs_find_best_ssid_in_list(priv, preferred_mode); found = lbs_find_best_ssid_in_list(priv, preferred_mode);
if (found && (found->ssid_len > 0)) { if (found && (found->ssid_len > 0)) {
memcpy(out_ssid, &found->ssid, IW_ESSID_MAX_SIZE); memcpy(out_ssid, &found->ssid, IEEE80211_MAX_SSID_LEN);
*out_ssid_len = found->ssid_len; *out_ssid_len = found->ssid_len;
*out_mode = found->mode; *out_mode = found->mode;
ret = 0; ret = 0;
@ -1759,7 +1759,7 @@ struct assoc_request *lbs_get_association_request(struct lbs_private *priv)
assoc_req = priv->pending_assoc_req; assoc_req = priv->pending_assoc_req;
if (!test_bit(ASSOC_FLAG_SSID, &assoc_req->flags)) { if (!test_bit(ASSOC_FLAG_SSID, &assoc_req->flags)) {
memcpy(&assoc_req->ssid, &priv->curbssparams.ssid, memcpy(&assoc_req->ssid, &priv->curbssparams.ssid,
IW_ESSID_MAX_SIZE); IEEE80211_MAX_SSID_LEN);
assoc_req->ssid_len = priv->curbssparams.ssid_len; assoc_req->ssid_len = priv->curbssparams.ssid_len;
} }

2
drivers/net/wireless/libertas/cmd.c
View File

@ -1167,7 +1167,7 @@ int lbs_mesh_config(struct lbs_private *priv, uint16_t action, uint16_t chan)
ie->val.mesh_id_len = priv->mesh_ssid_len; ie->val.mesh_id_len = priv->mesh_ssid_len;
memcpy(ie->val.mesh_id, priv->mesh_ssid, priv->mesh_ssid_len); memcpy(ie->val.mesh_id, priv->mesh_ssid, priv->mesh_ssid_len);
ie->len = sizeof(struct mrvl_meshie_val) - ie->len = sizeof(struct mrvl_meshie_val) -
IW_ESSID_MAX_SIZE + priv->mesh_ssid_len; IEEE80211_MAX_SSID_LEN + priv->mesh_ssid_len;
cmd.length = cpu_to_le16(sizeof(struct mrvl_meshie_val)); cmd.length = cpu_to_le16(sizeof(struct mrvl_meshie_val));
break; break;
case CMD_ACT_MESH_CONFIG_STOP: case CMD_ACT_MESH_CONFIG_STOP:

2
drivers/net/wireless/libertas/cmdresp.c
View File

@ -68,7 +68,7 @@ void lbs_mac_event_disconnected(struct lbs_private *priv)
* no longer valid. * no longer valid.
*/ */
memset(&priv->curbssparams.bssid, 0, ETH_ALEN); memset(&priv->curbssparams.bssid, 0, ETH_ALEN);
memset(&priv->curbssparams.ssid, 0, IW_ESSID_MAX_SIZE); memset(&priv->curbssparams.ssid, 0, IEEE80211_MAX_SSID_LEN);
priv->curbssparams.ssid_len = 0; priv->curbssparams.ssid_len = 0;
if (priv->psstate != PS_STATE_FULL_POWER) { if (priv->psstate != PS_STATE_FULL_POWER) {

10
drivers/net/wireless/libertas/dev.h
View File

@ -65,7 +65,7 @@ struct current_bss_params {
/** bssid */ /** bssid */
u8 bssid[ETH_ALEN]; u8 bssid[ETH_ALEN];
/** ssid */ /** ssid */
u8 ssid[IW_ESSID_MAX_SIZE + 1]; u8 ssid[IEEE80211_MAX_SSID_LEN + 1];
u8 ssid_len; u8 ssid_len;
/** band */ /** band */
@ -163,7 +163,7 @@ struct lbs_private {
struct work_struct sync_channel; struct work_struct sync_channel;
/* remember which channel was scanned last, != 0 if currently scanning */ /* remember which channel was scanned last, != 0 if currently scanning */
int scan_channel; int scan_channel;
u8 scan_ssid[IW_ESSID_MAX_SIZE + 1]; u8 scan_ssid[IEEE80211_MAX_SSID_LEN + 1];
u8 scan_ssid_len; u8 scan_ssid_len;
/** Hardware access */ /** Hardware access */
@ -230,7 +230,7 @@ struct lbs_private {
struct current_bss_params curbssparams; struct current_bss_params curbssparams;
uint16_t mesh_tlv; uint16_t mesh_tlv;
u8 mesh_ssid[IW_ESSID_MAX_SIZE + 1]; u8 mesh_ssid[IEEE80211_MAX_SSID_LEN + 1];
u8 mesh_ssid_len; u8 mesh_ssid_len;
/* IW_MODE_* */ /* IW_MODE_* */
@ -340,7 +340,7 @@ extern struct cmd_confirm_sleep confirm_sleep;
struct bss_descriptor { struct bss_descriptor {
u8 bssid[ETH_ALEN]; u8 bssid[ETH_ALEN];
u8 ssid[IW_ESSID_MAX_SIZE + 1]; u8 ssid[IEEE80211_MAX_SSID_LEN + 1];
u8 ssid_len; u8 ssid_len;
u16 capability; u16 capability;
@ -389,7 +389,7 @@ struct assoc_request {
#define ASSOC_FLAG_WPA_IE 11 #define ASSOC_FLAG_WPA_IE 11
unsigned long flags; unsigned long flags;
u8 ssid[IW_ESSID_MAX_SIZE + 1]; u8 ssid[IEEE80211_MAX_SSID_LEN + 1];
u8 ssid_len; u8 ssid_len;
u8 channel; u8 channel;
u8 band; u8 band;

4
drivers/net/wireless/libertas/host.h
View File

@ -719,7 +719,7 @@ struct cmd_ds_802_11_rate_adapt_rateset {
struct cmd_ds_802_11_ad_hoc_start { struct cmd_ds_802_11_ad_hoc_start {
struct cmd_header hdr; struct cmd_header hdr;
u8 ssid[IW_ESSID_MAX_SIZE]; u8 ssid[IEEE80211_MAX_SSID_LEN];
u8 bsstype; u8 bsstype;
__le16 beaconperiod; __le16 beaconperiod;
u8 dtimperiod; /* Reserved on v9 and later */ u8 dtimperiod; /* Reserved on v9 and later */
@ -742,7 +742,7 @@ struct cmd_ds_802_11_ad_hoc_result {
struct adhoc_bssdesc { struct adhoc_bssdesc {
u8 bssid[ETH_ALEN]; u8 bssid[ETH_ALEN];
u8 ssid[IW_ESSID_MAX_SIZE]; u8 ssid[IEEE80211_MAX_SSID_LEN];
u8 type; u8 type;
__le16 beaconperiod; __le16 beaconperiod;
u8 dtimperiod; u8 dtimperiod;

8
drivers/net/wireless/libertas/persistcfg.c
View File

@ -187,9 +187,9 @@ static ssize_t mesh_id_get(struct device *dev, struct device_attribute *attr,
if (ret) if (ret)
return ret; return ret;
if (defs.meshie.val.mesh_id_len > IW_ESSID_MAX_SIZE) { if (defs.meshie.val.mesh_id_len > IEEE80211_MAX_SSID_LEN) {
lbs_pr_err("inconsistent mesh ID length"); lbs_pr_err("inconsistent mesh ID length");
defs.meshie.val.mesh_id_len = IW_ESSID_MAX_SIZE; defs.meshie.val.mesh_id_len = IEEE80211_MAX_SSID_LEN;
} }
/* SSID not null terminated: reserve room for \0 + \n */ /* 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,
int len; int len;
int ret; int ret;
if (count < 2 || count > IW_ESSID_MAX_SIZE + 1) if (count < 2 || count > IEEE80211_MAX_SSID_LEN + 1)
return -EINVAL; return -EINVAL;
memset(&cmd, 0, sizeof(struct cmd_ds_mesh_config)); 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,
/* SSID len */ /* SSID len */
ie->val.mesh_id_len = len; ie->val.mesh_id_len = len;
/* IE len */ /* IE len */
ie->len = sizeof(struct mrvl_meshie_val) - IW_ESSID_MAX_SIZE + len; ie->len = sizeof(struct mrvl_meshie_val) - IEEE80211_MAX_SSID_LEN + len;
ret = lbs_mesh_config_send(priv, &cmd, CMD_ACT_MESH_CONFIG_SET, ret = lbs_mesh_config_send(priv, &cmd, CMD_ACT_MESH_CONFIG_SET,
CMD_TYPE_MESH_SET_MESH_IE); CMD_TYPE_MESH_SET_MESH_IE);

6
drivers/net/wireless/libertas/scan.c
View File

@ -19,11 +19,11 @@
//! Approximate amount of data needed to pass a scan result back to iwlist //! Approximate amount of data needed to pass a scan result back to iwlist
#define MAX_SCAN_CELL_SIZE (IW_EV_ADDR_LEN \ #define MAX_SCAN_CELL_SIZE (IW_EV_ADDR_LEN \
+ IW_ESSID_MAX_SIZE \ + IEEE80211_MAX_SSID_LEN \
+ IW_EV_UINT_LEN \ + IW_EV_UINT_LEN \
+ IW_EV_FREQ_LEN \ + IW_EV_FREQ_LEN \
+ IW_EV_QUAL_LEN \ + IW_EV_QUAL_LEN \
+ IW_ESSID_MAX_SIZE \ + IEEE80211_MAX_SSID_LEN \
+ IW_EV_PARAM_LEN \ + IW_EV_PARAM_LEN \
+ 40) /* 40 for WPAIE */ + 40) /* 40 for WPAIE */
@ -775,7 +775,7 @@ static inline char *lbs_translate_scan(struct lbs_private *priv,
/* SSID */ /* SSID */
iwe.cmd = SIOCGIWESSID; iwe.cmd = SIOCGIWESSID;
iwe.u.data.flags = 1; iwe.u.data.flags = 1;
iwe.u.data.length = min((uint32_t) bss->ssid_len, (uint32_t) IW_ESSID_MAX_SIZE); iwe.u.data.length = min((uint32_t) bss->ssid_len, (uint32_t) IEEE80211_MAX_SSID_LEN);
start = iwe_stream_add_point(info, start, stop, &iwe, bss->ssid); start = iwe_stream_add_point(info, start, stop, &iwe, bss->ssid);
/* Mode */ /* Mode */

4
drivers/net/wireless/libertas/types.h
View File

@ -5,8 +5,8 @@
#define _LBS_TYPES_H_ #define _LBS_TYPES_H_
#include <linux/if_ether.h> #include <linux/if_ether.h>
#include <linux/ieee80211.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <linux/wireless.h>
struct ieee_ie_header { struct ieee_ie_header {
u8 id; u8 id;
@ -247,7 +247,7 @@ struct mrvl_meshie_val {
uint8_t active_metric_id; uint8_t active_metric_id;
uint8_t mesh_capability; uint8_t mesh_capability;
uint8_t mesh_id_len; uint8_t mesh_id_len;
uint8_t mesh_id[IW_ESSID_MAX_SIZE]; uint8_t mesh_id[IEEE80211_MAX_SSID_LEN];
} __attribute__ ((packed)); } __attribute__ ((packed));
struct mrvl_meshie { struct mrvl_meshie {

8
drivers/net/wireless/libertas/wext.c
View File

@ -1989,7 +1989,7 @@ static int lbs_set_essid(struct net_device *dev, struct iw_request_info *info,
{ {
struct lbs_private *priv = dev->ml_priv; struct lbs_private *priv = dev->ml_priv;
int ret = 0; int ret = 0;
u8 ssid[IW_ESSID_MAX_SIZE]; u8 ssid[IEEE80211_MAX_SSID_LEN];
u8 ssid_len = 0; u8 ssid_len = 0;
struct assoc_request * assoc_req; struct assoc_request * assoc_req;
int in_ssid_len = dwrq->length; int in_ssid_len = dwrq->length;
@ -2003,7 +2003,7 @@ static int lbs_set_essid(struct net_device *dev, struct iw_request_info *info,
} }
/* Check the size of the string */ /* Check the size of the string */
if (in_ssid_len > IW_ESSID_MAX_SIZE) { if (in_ssid_len > IEEE80211_MAX_SSID_LEN) {
ret = -E2BIG; ret = -E2BIG;
goto out; goto out;
} }
@ -2034,7 +2034,7 @@ out:
ret = -ENOMEM; ret = -ENOMEM;
} else { } else {
/* Copy the SSID to the association request */ /* Copy the SSID to the association request */
memcpy(&assoc_req->ssid, &ssid, IW_ESSID_MAX_SIZE); memcpy(&assoc_req->ssid, &ssid, IEEE80211_MAX_SSID_LEN);
assoc_req->ssid_len = ssid_len; assoc_req->ssid_len = ssid_len;
set_bit(ASSOC_FLAG_SSID, &assoc_req->flags); set_bit(ASSOC_FLAG_SSID, &assoc_req->flags);
lbs_postpone_association_work(priv); lbs_postpone_association_work(priv);
@ -2085,7 +2085,7 @@ static int lbs_mesh_set_essid(struct net_device *dev,
} }
/* Check the size of the string */ /* Check the size of the string */
if (dwrq->length > IW_ESSID_MAX_SIZE) { if (dwrq->length > IEEE80211_MAX_SSID_LEN) {
ret = -E2BIG; ret = -E2BIG;
goto out; goto out;
} }