Commit 5a1f052d authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2015-12-21' of... 

Merge tag 'iwlwifi-next-for-kalle-2015-12-21' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

* Make scan parameters low latency aware (Avi Stern)
* Fix in the NL80211_FEATURE_FULL_AP_CLIENT_STATE state case (Ayala)
* Fix enable injection mode (Chaya Rachel)
* Various cleanups (Dan / Julia / myself)
* Allow to stay more time on popular channels (David Spinadel)
* Bug fixes for D0i3 (Eliad / Luca)
* Fixes for GO uAPSD (myself)
* Start of TSO support (myself)
* Rate control bug fixes (Eyal / Gregory)
* Start the work on 9000 devices (Johannes / Sara / Oren)
* Start the work on a new Tx queue allocation model (Liad)
* Debug infrastructure enhancements (Golan)
parents 541c9a84 e5d15cb5

drivers/net/wireless/intel/iwlwifi/dvm/agn.h

+1 −10
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
 * in the file called COPYING.

 *

 * Contact Information:

 *  Intel Linux Wireless <ilw@linux.intel.com>

 *  Intel Linux Wireless <linuxwifi@intel.com>

 * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497

 *

 * BSD LICENSE
@@ -473,13 +473,4 @@ do { \ 
} while (0)

#endif				/* CONFIG_IWLWIFI_DEBUG */



extern const char *const iwl_dvm_cmd_strings[REPLY_MAX + 1];



static inline const char *iwl_dvm_get_cmd_string(u8 cmd)

{

	const char *s = iwl_dvm_cmd_strings[cmd];

	if (s)

		return s;

	return "UNKNOWN";

}

#endif /* __iwl_agn_h__ */

drivers/net/wireless/intel/iwlwifi/dvm/calib.c

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ static int iwl_sens_energy_cck(struct iwl_priv *priv, 
		/* If previous beacon had too many false alarms,

		 *   give it some extra margin by reducing sensitivity again

		 *   (but don't go below measured energy of desired Rx) */

		if (IWL_FA_TOO_MANY == data->nrg_prev_state) {

		if (data->nrg_prev_state == IWL_FA_TOO_MANY) {

			IWL_DEBUG_CALIB(priv, "... increasing margin\n");

			if (data->nrg_th_cck > (max_nrg_cck + NRG_MARGIN))

				data->nrg_th_cck -= NRG_MARGIN;

drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c

+4 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
 * in the file called COPYING.

 *

 * Contact Information:

 *  Intel Linux Wireless <ilw@linux.intel.com>

 *  Intel Linux Wireless <linuxwifi@intel.com>

 * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497

 *****************************************************************************/
@@ -32,7 +32,9 @@ 
#include <linux/debugfs.h>

#include <linux/ieee80211.h>

#include <net/mac80211.h>



#include "iwl-debug.h"

#include "iwl-trans.h"

#include "iwl-io.h"

#include "dev.h"

#include "agn.h"
@@ -438,7 +440,7 @@ static ssize_t iwl_dbgfs_rx_handlers_read(struct file *file, 
		if (priv->rx_handlers_stats[cnt] > 0)

			pos += scnprintf(buf + pos, bufsz - pos,

				"\tRx handler[%36s]:\t\t %u\n",

				iwl_dvm_get_cmd_string(cnt),

				iwl_get_cmd_string(priv->trans, (u32)cnt),

				priv->rx_handlers_stats[cnt]);

	}

drivers/net/wireless/intel/iwlwifi/dvm/dev.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
 * file called LICENSE.

 *

 * Contact Information:

 *  Intel Linux Wireless <ilw@linux.intel.com>

 *  Intel Linux Wireless <linuxwifi@intel.com>

 * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497

 *

 *****************************************************************************/

drivers/net/wireless/intel/iwlwifi/dvm/led.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
 * file called LICENSE.

 *

 * Contact Information:

 *  Intel Linux Wireless <ilw@linux.intel.com>

 *  Intel Linux Wireless <linuxwifi@intel.com>

 * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497

 *

 *****************************************************************************/

CRA Git | Maintained and supported by SUSTech CRA and CCSE