Commit 20416229 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

parents e3d52914 147fc9be

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -4362,7 +4362,7 @@ F: drivers/net/wireless/iwlegacy/ 


INTEL WIRELESS WIFI LINK (iwlwifi)

M:	Johannes Berg <johannes.berg@intel.com>

M:	Wey-Yi Guy <wey-yi.w.guy@intel.com>

M:	Emmanuel Grumbach <emmanuel.grumbach@intel.com>

M:	Intel Linux Wireless <ilw@linux.intel.com>

L:	linux-wireless@vger.kernel.org

W:	http://intellinuxwireless.org

drivers/net/wireless/iwlwifi/Kconfig

+0 −17
Original line number Diff line number Diff line
@@ -127,20 +127,3 @@ config IWLWIFI_DEVICE_TRACING 
	  If unsure, say Y so we can help you better when problems

	  occur.

endmenu
 


config IWLWIFI_P2P

	def_bool y

	bool "iwlwifi experimental P2P support"

	depends on IWLWIFI

	help

	  This option enables experimental P2P support for some devices

	  based on microcode support. Since P2P support is still under

	  development, this option may even enable it for some devices

	  now that turn out to not support it in the future due to

	  microcode restrictions.



	  To determine if your microcode supports the experimental P2P

	  offered by this option, check if the driver advertises AP

	  support when it is loaded.



	  Say Y only if you want to experiment with P2P.

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

+0 −6
Original line number Diff line number Diff line
@@ -106,7 +106,6 @@ extern const struct iwl_dvm_cfg iwl_dvm_6030_cfg; 
#define STATUS_CHANNEL_SWITCH_PENDING 11

#define STATUS_SCAN_COMPLETE	12

#define STATUS_POWER_PMI	13

#define STATUS_SCAN_ROC_EXPIRED 14



struct iwl_ucode_capabilities;
@@ -250,7 +249,6 @@ u8 iwl_toggle_tx_ant(struct iwl_priv *priv, u8 ant_idx, u8 valid); 


/* scan */

void iwlagn_post_scan(struct iwl_priv *priv);

void iwlagn_disable_roc(struct iwl_priv *priv);

int iwl_force_rf_reset(struct iwl_priv *priv, bool external);

void iwl_init_scan_params(struct iwl_priv *priv);

int iwl_scan_cancel(struct iwl_priv *priv);
@@ -265,10 +263,6 @@ int __must_check iwl_scan_initiate(struct iwl_priv *priv, 
				   enum iwl_scan_type scan_type,

				   enum ieee80211_band band);



void iwl_scan_roc_expired(struct iwl_priv *priv);

void iwl_scan_offchannel_skb(struct iwl_priv *priv);

void iwl_scan_offchannel_skb_status(struct iwl_priv *priv);



/* For faster active scanning, scan will move to the next channel if fewer than

 * PLCP_QUIET_THRESH packets are heard on this channel within

 * ACTIVE_QUIET_TIME after sending probe request.  This shortens the dwell

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

+0 −15
Original line number Diff line number Diff line
@@ -69,19 +69,7 @@ 
} while (0)



/* file operation */

#define DEBUGFS_READ_FUNC(name)                                         \

static ssize_t iwl_dbgfs_##name##_read(struct file *file,               \

					char __user *user_buf,          \

					size_t count, loff_t *ppos);



#define DEBUGFS_WRITE_FUNC(name)                                        \

static ssize_t iwl_dbgfs_##name##_write(struct file *file,              \

					const char __user *user_buf,    \

					size_t count, loff_t *ppos);





#define DEBUGFS_READ_FILE_OPS(name)                                     \

	DEBUGFS_READ_FUNC(name);                                        \

static const struct file_operations iwl_dbgfs_##name##_ops = {          \

	.read = iwl_dbgfs_##name##_read,				\

	.open = simple_open,						\
@@ -89,7 +77,6 @@ static const struct file_operations iwl_dbgfs_##name##_ops = { \ 
};



#define DEBUGFS_WRITE_FILE_OPS(name)                                    \

	DEBUGFS_WRITE_FUNC(name);                                       \

static const struct file_operations iwl_dbgfs_##name##_ops = {          \

	.write = iwl_dbgfs_##name##_write,                              \

	.open = simple_open,						\
@@ -98,8 +85,6 @@ static const struct file_operations iwl_dbgfs_##name##_ops = { \ 




#define DEBUGFS_READ_WRITE_FILE_OPS(name)                               \

	DEBUGFS_READ_FUNC(name);                                        \

	DEBUGFS_WRITE_FUNC(name);                                       \

static const struct file_operations iwl_dbgfs_##name##_ops = {          \

	.write = iwl_dbgfs_##name##_write,                              \

	.read = iwl_dbgfs_##name##_read,                                \

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

+0 −7
Original line number Diff line number Diff line
@@ -540,7 +540,6 @@ struct iwl_rxon_context { 
enum iwl_scan_type {

	IWL_SCAN_NORMAL,

	IWL_SCAN_RADIO_RESET,

	IWL_SCAN_ROC,

};



/**
@@ -825,12 +824,6 @@ struct iwl_priv { 
	struct reply_tx_error_statistics reply_tx_stats;

	struct reply_agg_tx_error_statistics reply_agg_tx_stats;



	/* remain-on-channel offload support */

	struct ieee80211_channel *hw_roc_channel;

	struct delayed_work hw_roc_disable_work;

	int hw_roc_duration;

	bool hw_roc_setup, hw_roc_start_notified;



	/* bt coex */

	u8 bt_enable_flag;

	u8 bt_status;