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

Commit 81a07128 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'wireless-drivers-for-davem-2015-01-09' of... 

Merge tag 'wireless-drivers-for-davem-2015-01-09' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers



* rtlwifi: fix a regression in large skb allocation failure

iwlwifi:

* fix for 7265D NVM check
* fixes for scan: fix long scanning times and network discovery
* new firmware API for iwlmvm supported devices
* fixes in rate control

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2bd82218 c702674f

drivers/net/wireless/iwlwifi/iwl-7000.c

+3 −3
Original line number Diff line number Diff line
@@ -69,8 +69,8 @@ 
#include "iwl-agn-hw.h"



/* Highest firmware API version supported */

#define IWL7260_UCODE_API_MAX	10

#define IWL3160_UCODE_API_MAX	10

#define IWL7260_UCODE_API_MAX	12

#define IWL3160_UCODE_API_MAX	12



/* Oldest version we won't warn about */

#define IWL7260_UCODE_API_OK	10
@@ -105,7 +105,7 @@ 
#define IWL7265_MODULE_FIRMWARE(api) IWL7265_FW_PRE __stringify(api) ".ucode"



#define IWL7265D_FW_PRE "iwlwifi-7265D-"

#define IWL7265D_MODULE_FIRMWARE(api) IWL7265_FW_PRE __stringify(api) ".ucode"

#define IWL7265D_MODULE_FIRMWARE(api) IWL7265D_FW_PRE __stringify(api) ".ucode"



#define NVM_HW_SECTION_NUM_FAMILY_7000		0

drivers/net/wireless/iwlwifi/iwl-8000.c

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ 
#include "iwl-agn-hw.h"



/* Highest firmware API version supported */

#define IWL8000_UCODE_API_MAX	10

#define IWL8000_UCODE_API_MAX	12



/* Oldest version we won't warn about */

#define IWL8000_UCODE_API_OK	10

drivers/net/wireless/iwlwifi/iwl-fw-file.h

+4 −0
Original line number Diff line number Diff line
@@ -243,6 +243,9 @@ enum iwl_ucode_tlv_flag { 
 * @IWL_UCODE_TLV_API_SF_NO_DUMMY_NOTIF: ucode supports disabling dummy notif.

 * @IWL_UCODE_TLV_API_FRAGMENTED_SCAN: This ucode supports active dwell time

 *	longer than the passive one, which is essential for fragmented scan.

 * @IWL_UCODE_TLV_API_BASIC_DWELL: use only basic dwell time in scan command,

 *	regardless of the band or the number of the probes. FW will calculate

 *	the actual dwell time.

 */

enum iwl_ucode_tlv_api {

	IWL_UCODE_TLV_API_WOWLAN_CONFIG_TID	= BIT(0),
@@ -253,6 +256,7 @@ enum iwl_ucode_tlv_api { 
	IWL_UCODE_TLV_API_LMAC_SCAN		= BIT(6),

	IWL_UCODE_TLV_API_SF_NO_DUMMY_NOTIF	= BIT(7),

	IWL_UCODE_TLV_API_FRAGMENTED_SCAN	= BIT(8),

	IWL_UCODE_TLV_API_BASIC_DWELL		= BIT(13),

};



/**

drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h

+2 −0
Original line number Diff line number Diff line
@@ -672,6 +672,7 @@ struct iwl_scan_channel_opt { 
 * @IWL_MVM_LMAC_SCAN_FLAG_FRAGMENTED: all passive scans will be fragmented

 * @IWL_MVM_LMAC_SCAN_FLAGS_RRM_ENABLED: insert WFA vendor-specific TPC report

 *	and DS parameter set IEs into probe requests.

 * @IWL_MVM_LMAC_SCAN_FLAG_MATCH: Send match found notification on matches

 */

enum iwl_mvm_lmac_scan_flags {

	IWL_MVM_LMAC_SCAN_FLAG_PASS_ALL		= BIT(0),
@@ -681,6 +682,7 @@ enum iwl_mvm_lmac_scan_flags { 
	IWL_MVM_LMAC_SCAN_FLAG_MULTIPLE_SSIDS	= BIT(4),

	IWL_MVM_LMAC_SCAN_FLAG_FRAGMENTED	= BIT(5),

	IWL_MVM_LMAC_SCAN_FLAGS_RRM_ENABLED	= BIT(6),

	IWL_MVM_LMAC_SCAN_FLAG_MATCH		= BIT(9),

};



enum iwl_scan_priority {

drivers/net/wireless/iwlwifi/mvm/scan.c

+14 −5
Original line number Diff line number Diff line
@@ -171,15 +171,21 @@ static void iwl_mvm_scan_fill_ssids(struct iwl_ssid_ie *cmd_ssid, 
 * already included in the probe template, so we need to set only

 * req->n_ssids - 1 bits in addition to the first bit.

 */

static u16 iwl_mvm_get_active_dwell(enum ieee80211_band band, int n_ssids)

static u16 iwl_mvm_get_active_dwell(struct iwl_mvm *mvm,

				    enum ieee80211_band band, int n_ssids)

{

	if (mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_BASIC_DWELL)

		return 10;

	if (band == IEEE80211_BAND_2GHZ)

		return 20  + 3 * (n_ssids + 1);

	return 10  + 2 * (n_ssids + 1);

}



static u16 iwl_mvm_get_passive_dwell(enum ieee80211_band band)

static u16 iwl_mvm_get_passive_dwell(struct iwl_mvm *mvm,

				     enum ieee80211_band band)

{

	if (mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_BASIC_DWELL)

			return 110;

	return band == IEEE80211_BAND_2GHZ ? 100 + 20 : 100 + 10;

}
@@ -331,7 +337,8 @@ static void iwl_mvm_scan_calc_params(struct iwl_mvm *mvm, 
		 */

		if (vif->type == NL80211_IFTYPE_P2P_DEVICE) {

			u32 passive_dwell =

				iwl_mvm_get_passive_dwell(IEEE80211_BAND_2GHZ);

				iwl_mvm_get_passive_dwell(mvm,

							  IEEE80211_BAND_2GHZ);

			params->max_out_time = passive_dwell;

		} else {

			params->passive_fragmented = true;
@@ -348,8 +355,8 @@ static void iwl_mvm_scan_calc_params(struct iwl_mvm *mvm, 
			params->dwell[band].passive = frag_passive_dwell;

		else

			params->dwell[band].passive =

				iwl_mvm_get_passive_dwell(band);

		params->dwell[band].active = iwl_mvm_get_active_dwell(band,

				iwl_mvm_get_passive_dwell(mvm, band);

		params->dwell[band].active = iwl_mvm_get_active_dwell(mvm, band,

								      n_ssids);

	}

}
@@ -1448,6 +1455,8 @@ int iwl_mvm_unified_sched_scan_lmac(struct iwl_mvm *mvm, 


	if (iwl_mvm_scan_pass_all(mvm, req))

		flags |= IWL_MVM_LMAC_SCAN_FLAG_PASS_ALL;

	else

		flags |= IWL_MVM_LMAC_SCAN_FLAG_MATCH;



	if (req->n_ssids == 1 && req->ssids[0].ssid_len != 0)

		flags |= IWL_MVM_LMAC_SCAN_FLAG_PRE_CONNECTION;