Commit 243e84e9 authored by Holger Schurig's avatar Holger Schurig Committed by John W. Linville
Browse files

libertas: change IW_ESSID_MAX_SIZE -> IEEE80211_MAX_SSID_LEN 



Signed-off-by: default avatarHolger Schurig <hs4233@mail.mn-solutions.de>
Acked-by: default avatarDan Williams <dcbw@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f4228b4c

drivers/net/wireless/libertas/assoc.c

+5 −5
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ static int lbs_assoc_post(struct lbs_private *priv, 
	priv->connect_status = LBS_CONNECTED;



	/* 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;

	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);



	/* 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;



	netif_carrier_on(priv->dev);
@@ -1083,7 +1083,7 @@ static int assoc_helper_essid(struct lbs_private *priv, 
			/* else send START command */

			lbs_deb_assoc("SSID not found, creating adhoc network\n");

			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;

			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);

	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_mode = found->mode;

		ret = 0;
@@ -1759,7 +1759,7 @@ struct assoc_request *lbs_get_association_request(struct lbs_private *priv) 
	assoc_req = priv->pending_assoc_req;

	if (!test_bit(ASSOC_FLAG_SSID, &assoc_req->flags)) {

		memcpy(&assoc_req->ssid, &priv->curbssparams.ssid,

		       IW_ESSID_MAX_SIZE);

		       IEEE80211_MAX_SSID_LEN);

		assoc_req->ssid_len = priv->curbssparams.ssid_len;

	}

drivers/net/wireless/libertas/cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

		memcpy(ie->val.mesh_id, priv->mesh_ssid, priv->mesh_ssid_len);

		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));

		break;

	case CMD_ACT_MESH_CONFIG_STOP:

drivers/net/wireless/libertas/cmdresp.c

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ void lbs_mac_event_disconnected(struct lbs_private *priv) 
	 * no longer valid.

	 */

	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;



	if (priv->psstate != PS_STATE_FULL_POWER) {

drivers/net/wireless/libertas/dev.h

+5 −5
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ struct current_bss_params { 
	/** bssid */

	u8 bssid[ETH_ALEN];

	/** ssid */

	u8 ssid[IW_ESSID_MAX_SIZE + 1];

	u8 ssid[IEEE80211_MAX_SSID_LEN + 1];

	u8 ssid_len;



	/** band */
@@ -163,7 +163,7 @@ struct lbs_private { 
	struct work_struct sync_channel;

	/* remember which channel was scanned last, != 0 if currently scanning */

	int scan_channel;

	u8 scan_ssid[IW_ESSID_MAX_SIZE + 1];

	u8 scan_ssid[IEEE80211_MAX_SSID_LEN + 1];

	u8 scan_ssid_len;



	/** Hardware access */
@@ -230,7 +230,7 @@ struct lbs_private { 
	struct current_bss_params curbssparams;



	uint16_t mesh_tlv;

	u8 mesh_ssid[IW_ESSID_MAX_SIZE + 1];

	u8 mesh_ssid[IEEE80211_MAX_SSID_LEN + 1];

	u8 mesh_ssid_len;



	/* IW_MODE_* */
@@ -340,7 +340,7 @@ extern struct cmd_confirm_sleep confirm_sleep; 
struct bss_descriptor {

	u8 bssid[ETH_ALEN];



	u8 ssid[IW_ESSID_MAX_SIZE + 1];

	u8 ssid[IEEE80211_MAX_SSID_LEN + 1];

	u8 ssid_len;



	u16 capability;
@@ -389,7 +389,7 @@ struct assoc_request { 
#define ASSOC_FLAG_WPA_IE		11

	unsigned long flags;



	u8 ssid[IW_ESSID_MAX_SIZE + 1];

	u8 ssid[IEEE80211_MAX_SSID_LEN + 1];

	u8 ssid_len;

	u8 channel;

	u8 band;

drivers/net/wireless/libertas/host.h

+2 −2
Original line number Diff line number Diff line
@@ -719,7 +719,7 @@ struct cmd_ds_802_11_rate_adapt_rateset { 
struct cmd_ds_802_11_ad_hoc_start {

	struct cmd_header hdr;



	u8 ssid[IW_ESSID_MAX_SIZE];

	u8 ssid[IEEE80211_MAX_SSID_LEN];

	u8 bsstype;

	__le16 beaconperiod;

	u8 dtimperiod;   /* Reserved on v9 and later */
@@ -742,7 +742,7 @@ struct cmd_ds_802_11_ad_hoc_result { 


struct adhoc_bssdesc {

	u8 bssid[ETH_ALEN];

	u8 ssid[IW_ESSID_MAX_SIZE];

	u8 ssid[IEEE80211_MAX_SSID_LEN];

	u8 type;

	__le16 beaconperiod;

	u8 dtimperiod;