---

yaml --- r: 315228 b: refs/heads/master c: adb6ed0 h: refs/heads/master v: v3
git-mirror · Jul 9, 2012 · fffe6b4 · fffe6b4
1 parent 283431e
commit fffe6b4
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 24 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd2841c5b59c276796f730b77ef37408c0909f9c
+refs/heads/master: adb6ed0c5a8b906b3d75f4d0b1b2e252795029c0
diff --git a/trunk/drivers/net/wireless/mwifiex/cfg80211.c b/trunk/drivers/net/wireless/mwifiex/cfg80211.c
@@ -947,7 +947,7 @@ static int mwifiex_cfg80211_start_ap(struct wiphy *wiphy,
 
 	if (priv->bss_type != MWIFIEX_BSS_TYPE_UAP)
 		return -1;
-	if (mwifiex_set_mgmt_ies(priv, params))
+	if (mwifiex_set_mgmt_ies(priv, &params->beacon))
 		return -1;
 
 	bss_cfg = kzalloc(sizeof(struct mwifiex_uap_bss_param), GFP_KERNEL);

diff --git a/trunk/drivers/net/wireless/mwifiex/ie.c b/trunk/drivers/net/wireless/mwifiex/ie.c
@@ -222,7 +222,7 @@ mwifiex_update_uap_custom_ie(struct mwifiex_private *priv,
  * to FW.
  */
 int mwifiex_set_mgmt_ies(struct mwifiex_private *priv,
-			 struct cfg80211_ap_settings *params)
+			 struct cfg80211_beacon_data *data)
 {
 	struct mwifiex_ie *beacon_ie = NULL, *pr_ie = NULL;
 	struct mwifiex_ie *ar_ie = NULL, *gen_ie = NULL;
@@ -233,7 +233,7 @@ int mwifiex_set_mgmt_ies(struct mwifiex_private *priv,
 	const u8 *vendor_ie;
 	int ret = 0;
 
-	if (params->beacon.tail && params->beacon.tail_len) {
+	if (data->tail && data->tail_len) {
 		gen_ie = kzalloc(sizeof(struct mwifiex_ie), GFP_KERNEL);
 		if (!gen_ie)
 			return -ENOMEM;
@@ -243,8 +243,7 @@ int mwifiex_set_mgmt_ies(struct mwifiex_private *priv,
 		gen_ie->mgmt_subtype_mask = cpu_to_le16(mask);
 
 		rsn_ie = (void *)cfg80211_find_ie(WLAN_EID_RSN,
-						  params->beacon.tail,
-						  params->beacon.tail_len);
+						  data->tail, data->tail_len);
 		if (rsn_ie) {
 			memcpy(gen_ie->ie_buffer, rsn_ie, rsn_ie->len + 2);
 			ie_len = rsn_ie->len + 2;
@@ -253,8 +252,7 @@ int mwifiex_set_mgmt_ies(struct mwifiex_private *priv,
 
 		vendor_ie = cfg80211_find_vendor_ie(WLAN_OUI_MICROSOFT,
 						    WLAN_OUI_TYPE_MICROSOFT_WPA,
-						    params->beacon.tail,
-						    params->beacon.tail_len);
+						    data->tail, data->tail_len);
 		if (vendor_ie) {
 			wpa_ie = (struct ieee_types_header *)vendor_ie;
 			memcpy(gen_ie->ie_buffer + ie_len,
@@ -275,7 +273,7 @@ int mwifiex_set_mgmt_ies(struct mwifiex_private *priv,
 		}
 	}
 
-	if (params->beacon.beacon_ies && params->beacon.beacon_ies_len) {
+	if (data->beacon_ies && data->beacon_ies_len) {
 		beacon_ie = kmalloc(sizeof(struct mwifiex_ie), GFP_KERNEL);
 		if (!beacon_ie) {
 			ret = -ENOMEM;
@@ -284,13 +282,12 @@ int mwifiex_set_mgmt_ies(struct mwifiex_private *priv,
 
 		beacon_ie->ie_index = cpu_to_le16(beacon_idx);
 		beacon_ie->mgmt_subtype_mask = cpu_to_le16(MGMT_MASK_BEACON);
-		beacon_ie->ie_length =
-				cpu_to_le16(params->beacon.beacon_ies_len);
-		memcpy(beacon_ie->ie_buffer, params->beacon.beacon_ies,
-		       params->beacon.beacon_ies_len);
+		beacon_ie->ie_length = cpu_to_le16(data->beacon_ies_len);
+		memcpy(beacon_ie->ie_buffer, data->beacon_ies,
+		       data->beacon_ies_len);
 	}
 
-	if (params->beacon.proberesp_ies && params->beacon.proberesp_ies_len) {
+	if (data->proberesp_ies && data->proberesp_ies_len) {
 		pr_ie = kmalloc(sizeof(struct mwifiex_ie), GFP_KERNEL);
 		if (!pr_ie) {
 			ret = -ENOMEM;
@@ -299,13 +296,12 @@ int mwifiex_set_mgmt_ies(struct mwifiex_private *priv,
 
 		pr_ie->ie_index = cpu_to_le16(pr_idx);
 		pr_ie->mgmt_subtype_mask = cpu_to_le16(MGMT_MASK_PROBE_RESP);
-		pr_ie->ie_length =
-				cpu_to_le16(params->beacon.proberesp_ies_len);
-		memcpy(pr_ie->ie_buffer, params->beacon.proberesp_ies,
-		       params->beacon.proberesp_ies_len);
+		pr_ie->ie_length = cpu_to_le16(data->proberesp_ies_len);
+		memcpy(pr_ie->ie_buffer, data->proberesp_ies,
+		       data->proberesp_ies_len);
 	}
 
-	if (params->beacon.assocresp_ies && params->beacon.assocresp_ies_len) {
+	if (data->assocresp_ies && data->assocresp_ies_len) {
 		ar_ie = kmalloc(sizeof(struct mwifiex_ie), GFP_KERNEL);
 		if (!ar_ie) {
 			ret = -ENOMEM;
@@ -315,10 +311,9 @@ int mwifiex_set_mgmt_ies(struct mwifiex_private *priv,
 		ar_ie->ie_index = cpu_to_le16(ar_idx);
 		mask = MGMT_MASK_ASSOC_RESP | MGMT_MASK_REASSOC_RESP;
 		ar_ie->mgmt_subtype_mask = cpu_to_le16(mask);
-		ar_ie->ie_length =
-				cpu_to_le16(params->beacon.assocresp_ies_len);
-		memcpy(ar_ie->ie_buffer, params->beacon.assocresp_ies,
-		       params->beacon.assocresp_ies_len);
+		ar_ie->ie_length = cpu_to_le16(data->assocresp_ies_len);
+		memcpy(ar_ie->ie_buffer, data->assocresp_ies,
+		       data->assocresp_ies_len);
 	}
 
 	if (beacon_ie || pr_ie || ar_ie) {

diff --git a/trunk/drivers/net/wireless/mwifiex/main.h b/trunk/drivers/net/wireless/mwifiex/main.h
@@ -1013,7 +1013,7 @@ int mwifiex_del_virtual_intf(struct wiphy *wiphy, struct net_device *dev);
 void mwifiex_set_sys_config_invalid_data(struct mwifiex_uap_bss_param *config);
 
 int mwifiex_set_mgmt_ies(struct mwifiex_private *priv,
-			 struct cfg80211_ap_settings *params);
+			 struct cfg80211_beacon_data *data);
 int mwifiex_del_mgmt_ies(struct mwifiex_private *priv);
 u8 *mwifiex_11d_code_2_region(u8 code);