Commit 9829e1b5 authored by Samuel Ortiz's avatar Samuel Ortiz Committed by John W. Linville
Browse files

iwmc3200wifi: Try shared auth when open WEP fails 



When we fail to associate with an open WEP AP, we fall back to shared auth.
This allows us to support joining a shared auth WEP AP with iwconfig.

Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 56e3f085

drivers/net/wireless/iwmc3200wifi/commands.c

+1 −1
Original line number Diff line number Diff line
@@ -793,7 +793,7 @@ int iwm_invalidate_mlme_profile(struct iwm_priv *iwm) 
		return ret;



	ret = wait_event_interruptible_timeout(iwm->mlme_queue,

				(iwm->umac_profile_active == 0), 2 * HZ);

				(iwm->umac_profile_active == 0), 5 * HZ);



	return ret ? 0 : -EBUSY;

}

drivers/net/wireless/iwmc3200wifi/iwm.h

+1 −0
Original line number Diff line number Diff line
@@ -285,6 +285,7 @@ struct iwm_priv { 
	u8 *eeprom;

	struct timer_list watchdog;

	struct work_struct reset_worker;

	struct work_struct auth_retry_worker;

	struct mutex mutex;



	u8 *req_ie;

drivers/net/wireless/iwmc3200wifi/main.c

+28 −0
Original line number Diff line number Diff line
@@ -207,6 +207,33 @@ static void iwm_reset_worker(struct work_struct *work) 
	mutex_unlock(&iwm->mutex);

}



static void iwm_auth_retry_worker(struct work_struct *work)

{

	struct iwm_priv *iwm;

	int i, ret;



	iwm = container_of(work, struct iwm_priv, auth_retry_worker);

	if (iwm->umac_profile_active) {

		ret = iwm_invalidate_mlme_profile(iwm);

		if (ret < 0)

			return;

	}



	iwm->umac_profile->sec.auth_type = UMAC_AUTH_TYPE_LEGACY_PSK;



	ret = iwm_send_mlme_profile(iwm);

	if (ret < 0)

		return;



	for (i = 0; i < IWM_NUM_KEYS; i++)

		if (iwm->keys[i].key_len)

			iwm_set_key(iwm, 0, &iwm->keys[i]);



	iwm_set_tx_key(iwm, iwm->default_key);

}







static void iwm_watchdog(unsigned long data)

{

	struct iwm_priv *iwm = (struct iwm_priv *)data;
@@ -240,6 +267,7 @@ int iwm_priv_init(struct iwm_priv *iwm) 
	INIT_DELAYED_WORK(&iwm->disconnect, iwm_disconnect_work);

	INIT_DELAYED_WORK(&iwm->ct_kill_delay, iwm_ct_kill_work);

	INIT_WORK(&iwm->reset_worker, iwm_reset_worker);

	INIT_WORK(&iwm->auth_retry_worker, iwm_auth_retry_worker);

	INIT_LIST_HEAD(&iwm->bss_list);



	skb_queue_head_init(&iwm->rx_list);

drivers/net/wireless/iwmc3200wifi/rx.c

+23 −5
Original line number Diff line number Diff line
@@ -501,6 +501,18 @@ static int iwm_mlme_assoc_start(struct iwm_priv *iwm, u8 *buf, 
	return 0;

}



static u8 iwm_is_open_wep_profile(struct iwm_priv *iwm)

{

	if ((iwm->umac_profile->sec.ucast_cipher == UMAC_CIPHER_TYPE_WEP_40 ||

	     iwm->umac_profile->sec.ucast_cipher == UMAC_CIPHER_TYPE_WEP_104) &&

	    (iwm->umac_profile->sec.ucast_cipher ==

	     iwm->umac_profile->sec.mcast_cipher) &&

	    (iwm->umac_profile->sec.auth_type == UMAC_AUTH_TYPE_OPEN))

	       return 1;



       return 0;

}



static int iwm_mlme_assoc_complete(struct iwm_priv *iwm, u8 *buf,

				   unsigned long buf_size,

				   struct iwm_wifi_cmd *cmd)
@@ -566,11 +578,17 @@ static int iwm_mlme_assoc_complete(struct iwm_priv *iwm, u8 *buf, 
			goto ibss;



		if (!test_bit(IWM_STATUS_RESETTING, &iwm->status))

			if (!iwm_is_open_wep_profile(iwm)) {

				cfg80211_connect_result(iwm_to_ndev(iwm),

					       complete->bssid,

					       NULL, 0, NULL, 0,

					       WLAN_STATUS_UNSPECIFIED_FAILURE,

					       GFP_KERNEL);

			} else {

				/* Let's try shared WEP auth */

				IWM_ERR(iwm, "Trying WEP shared auth\n");

				schedule_work(&iwm->auth_retry_worker);

			}

		else

			cfg80211_disconnected(iwm_to_ndev(iwm), 0, NULL, 0,

					      GFP_KERNEL);