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

Commit a6bf49db authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2015-08-18' of... 

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

* polish the Miracast operation
* fix a few power consumption issues
* scan cleanup
* fixes for D0i3 system state
* add paging for devices that support it
* add again the new RBD allocation model
* add more options to the firmware debug system
* add support for frag SKBs in Tx
parents 74f4e0cc ecc7c518

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

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static inline void iwl_set_calib_hdr(struct iwl_calib_hdr *hdr, u8 cmd) 
void iwl_down(struct iwl_priv *priv);

void iwl_cancel_deferred_work(struct iwl_priv *priv);

void iwlagn_prepare_restart(struct iwl_priv *priv);

void iwl_rx_dispatch(struct iwl_op_mode *op_mode,

void iwl_rx_dispatch(struct iwl_op_mode *op_mode, struct napi_struct *napi,

		     struct iwl_rx_cmd_buffer *rxb);



bool iwl_check_for_ct_kill(struct iwl_priv *priv);

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

+2 −6
Original line number Diff line number Diff line
@@ -310,12 +310,8 @@ static ssize_t iwl_dbgfs_nvm_read(struct file *file, 
	pos += scnprintf(buf + pos, buf_size - pos,

			 "NVM version: 0x%x\n", nvm_ver);

	for (ofs = 0 ; ofs < eeprom_len ; ofs += 16) {

		pos += scnprintf(buf + pos, buf_size - pos, "0x%.4x ", ofs);

		hex_dump_to_buffer(ptr + ofs, 16 , 16, 2, buf + pos,

				   buf_size - pos, 0);

		pos += strlen(buf + pos);

		if (buf_size - pos > 0)

			buf[pos++] = '\n';

		pos += scnprintf(buf + pos, buf_size - pos, "0x%.4x %16ph\n",

				 ofs, ptr + ofs);

	}



	ret = simple_read_from_buffer(user_buf, count, ppos, buf, pos);

drivers/net/wireless/iwlwifi/dvm/main.c

+0 −13
Original line number Diff line number Diff line
@@ -2029,18 +2029,6 @@ static bool iwl_set_hw_rfkill_state(struct iwl_op_mode *op_mode, bool state) 
	return false;

}



static void iwl_napi_add(struct iwl_op_mode *op_mode,

			 struct napi_struct *napi,

			 struct net_device *napi_dev,

			 int (*poll)(struct napi_struct *, int),

			 int weight)

{

	struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);



	netif_napi_add(napi_dev, napi, poll, weight);

	priv->napi = napi;

}



static const struct iwl_op_mode_ops iwl_dvm_ops = {

	.start = iwl_op_mode_dvm_start,

	.stop = iwl_op_mode_dvm_stop,
@@ -2053,7 +2041,6 @@ static const struct iwl_op_mode_ops iwl_dvm_ops = { 
	.cmd_queue_full = iwl_cmd_queue_full,

	.nic_config = iwl_nic_config,

	.wimax_active = iwl_wimax_active,

	.napi_add = iwl_napi_add,

};



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

drivers/net/wireless/iwlwifi/dvm/rx.c

+2 −1
Original line number Diff line number Diff line
@@ -1073,7 +1073,8 @@ void iwl_setup_rx_handlers(struct iwl_priv *priv) 
		iwlagn_bt_rx_handler_setup(priv);

}



void iwl_rx_dispatch(struct iwl_op_mode *op_mode, struct iwl_rx_cmd_buffer *rxb)

void iwl_rx_dispatch(struct iwl_op_mode *op_mode, struct napi_struct *napi,

		     struct iwl_rx_cmd_buffer *rxb)

{

	struct iwl_rx_packet *pkt = rxb_addr(rxb);

	struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);

drivers/net/wireless/iwlwifi/iwl-7000.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 IWL7260_UCODE_API_MAX	15

#define IWL7260_UCODE_API_MAX	16



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

#define IWL7260_UCODE_API_OK	12