Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad41ee3a authored by Reinette Chatre's avatar Reinette Chatre
Browse files

Merge branch 'wireless-2.6' into wireless-next-2.6 



Patch "iwlwifi: work around passive scan issue" was merged into
wireless-2.6, but touched a lot of code since modified (and moved)
in wireless-next-2.6. This caused some conflicts.

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-scan.c

Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
parents 49b5c7f4 96ff5641

drivers/net/wireless/iwlwifi/iwl-agn-lib.c

+18 −5
Original line number Diff line number Diff line
@@ -1395,16 +1395,29 @@ void iwlagn_request_scan(struct iwl_priv *priv) 
			rate = IWL_RATE_1M_PLCP;

			rate_flags = RATE_MCS_CCK_MSK;

		}

		scan->good_CRC_th = 0;

		scan->good_CRC_th = IWL_GOOD_CRC_TH_DISABLED;

		break;

	case IEEE80211_BAND_5GHZ:

		rate = IWL_RATE_6M_PLCP;

		/*

		 * If active scaning is requested but a certain channel

		 * is marked passive, we can do active scanning if we

		 * detect transmissions.

		 * If active scanning is requested but a certain channel is

		 * marked passive, we can do active scanning if we detect

		 * transmissions.

		 *

		 * There is an issue with some firmware versions that triggers

		 * a sysassert on a "good CRC threshold" of zero (== disabled),

		 * on a radar channel even though this means that we should NOT

		 * send probes.

		 *

		 * The "good CRC threshold" is the number of frames that we

		 * need to receive during our dwell time on a channel before

		 * sending out probes -- setting this to a huge value will

		 * mean we never reach it, but at the same time work around

		 * the aforementioned issue. Thus use IWL_GOOD_CRC_TH_NEVER

		 * here instead of IWL_GOOD_CRC_TH_DISABLED.

		 */

		scan->good_CRC_th = is_active ? IWL_GOOD_CRC_TH : 0;

		scan->good_CRC_th = is_active ? IWL_GOOD_CRC_TH_DEFAULT :

						IWL_GOOD_CRC_TH_NEVER;

		break;

	default:

		IWL_WARN(priv, "Invalid scan band count\n");

drivers/net/wireless/iwlwifi/iwl-commands.h

+3 −1
Original line number Diff line number Diff line
@@ -2663,7 +2663,9 @@ struct iwl_ssid_ie { 
#define PROBE_OPTION_MAX_3945		4

#define PROBE_OPTION_MAX		20

#define TX_CMD_LIFE_TIME_INFINITE	cpu_to_le32(0xFFFFFFFF)

#define IWL_GOOD_CRC_TH			cpu_to_le16(1)

#define IWL_GOOD_CRC_TH_DISABLED	0

#define IWL_GOOD_CRC_TH_DEFAULT		cpu_to_le16(1)

#define IWL_GOOD_CRC_TH_NEVER		cpu_to_le16(0xffff)

#define IWL_MAX_SCAN_SIZE 1024

#define IWL_MAX_CMD_SIZE 4096

#define IWL_MAX_PROBE_REQUEST		200

drivers/net/wireless/iwlwifi/iwl3945-base.c

+2 −1
Original line number Diff line number Diff line
@@ -2938,7 +2938,8 @@ void iwl3945_request_scan(struct iwl_priv *priv) 
		 * is marked passive, we can do active scanning if we

		 * detect transmissions.

		 */

		scan->good_CRC_th = is_active ? IWL_GOOD_CRC_TH : 0;

		scan->good_CRC_th = is_active ? IWL_GOOD_CRC_TH_DEFAULT :

						IWL_GOOD_CRC_TH_DISABLED;

		band = IEEE80211_BAND_5GHZ;

		break;

	default:

drivers/net/wireless/p54/p54pci.c

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ static void p54p_check_tx_ring(struct ieee80211_hw *dev, u32 *index, 
	u32 idx, i;



	i = (*index) % ring_limit;

	(*index) = idx = le32_to_cpu(ring_control->device_idx[1]);

	(*index) = idx = le32_to_cpu(ring_control->device_idx[ring_index]);

	idx %= ring_limit;



	while (i != idx) {

net/mac80211/agg-tx.c

+0 −1
Original line number Diff line number Diff line
@@ -183,7 +183,6 @@ static void sta_addba_resp_timer_expired(unsigned long data) 
		       HT_AGG_STATE_REQ_STOP_BA_MSK)) !=

						HT_ADDBA_REQUESTED_MSK) {

		spin_unlock_bh(&sta->lock);

		*state = HT_AGG_STATE_IDLE;

#ifdef CONFIG_MAC80211_HT_DEBUG

		printk(KERN_DEBUG "timer expired on tid %d but we are not "

				"(or no longer) expecting addBA response there\n",