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

Commit 59731bb8 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 729d8d18 bd4ace2a

drivers/net/wireless/iwlwifi/Kconfig

+0 −10
Original line number Original line Diff line number Diff line
@@ -128,16 +128,6 @@ config IWLWIFI_DEVICE_TRACING 
	  occur.

	  occur.

endmenu

endmenu





config IWLWIFI_DEVICE_TESTMODE

	def_bool y

	depends on IWLWIFI

	depends on NL80211_TESTMODE

	help

	  This option enables the testmode support for iwlwifi device through

	  NL80211_TESTMODE. This provide the capabilities of enable user space

	  validation applications to interacts with the device through the

	  generic netlink message via NL80211_TESTMODE channel.



config IWLWIFI_P2P

config IWLWIFI_P2P

	def_bool y

	def_bool y

	bool "iwlwifi experimental P2P support"

	bool "iwlwifi experimental P2P support"

drivers/net/wireless/iwlwifi/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -13,7 +13,6 @@ iwlwifi-$(CONFIG_IWLMVM) += iwl-7000.o 
iwlwifi-objs += $(iwlwifi-m)

iwlwifi-objs += $(iwlwifi-m)





iwlwifi-$(CONFIG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o

iwlwifi-$(CONFIG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o

iwlwifi-$(CONFIG_IWLWIFI_DEVICE_TESTMODE) += iwl-test.o





ccflags-y += -D__CHECK_ENDIAN__ -I$(src)

ccflags-y += -D__CHECK_ENDIAN__ -I$(src)

drivers/net/wireless/iwlwifi/dvm/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -8,6 +8,5 @@ iwldvm-objs += scan.o led.o 
iwldvm-objs		+= rxon.o devices.o

iwldvm-objs		+= rxon.o devices.o





iwldvm-$(CONFIG_IWLWIFI_DEBUGFS) += debugfs.o

iwldvm-$(CONFIG_IWLWIFI_DEBUGFS) += debugfs.o

iwldvm-$(CONFIG_IWLWIFI_DEVICE_TESTMODE) += testmode.o





ccflags-y += -D__CHECK_ENDIAN__ -I$(src)/../
 
ccflags-y += -D__CHECK_ENDIAN__ -I$(src)/../

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

+0 −37
Original line number Original line Diff line number Diff line
@@ -405,43 +405,6 @@ static inline __le32 iwl_hw_set_rate_n_flags(u8 rate, u32 flags) 




extern int iwl_alive_start(struct iwl_priv *priv);

extern int iwl_alive_start(struct iwl_priv *priv);





/* testmode support */

#ifdef CONFIG_IWLWIFI_DEVICE_TESTMODE



extern int iwlagn_mac_testmode_cmd(struct ieee80211_hw *hw, void *data,

				   int len);

extern int iwlagn_mac_testmode_dump(struct ieee80211_hw *hw,

				    struct sk_buff *skb,

				    struct netlink_callback *cb,

				    void *data, int len);

extern void iwl_testmode_init(struct iwl_priv *priv);

extern void iwl_testmode_free(struct iwl_priv *priv);



#else



static inline

int iwlagn_mac_testmode_cmd(struct ieee80211_hw *hw, void *data, int len)

{

	return -ENOSYS;

}



static inline

int iwlagn_mac_testmode_dump(struct ieee80211_hw *hw, struct sk_buff *skb,

		      struct netlink_callback *cb,

		      void *data, int len)

{

	return -ENOSYS;

}



static inline void iwl_testmode_init(struct iwl_priv *priv)

{

}



static inline void iwl_testmode_free(struct iwl_priv *priv)

{

}

#endif



#ifdef CONFIG_IWLWIFI_DEBUG

#ifdef CONFIG_IWLWIFI_DEBUG

void iwl_print_rx_config_cmd(struct iwl_priv *priv,

void iwl_print_rx_config_cmd(struct iwl_priv *priv,

			     enum iwl_rxon_context_id ctxid);

			     enum iwl_rxon_context_id ctxid);

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

+1 −12
Original line number Original line Diff line number Diff line
@@ -52,8 +52,6 @@ 
#include "rs.h"

#include "rs.h"

#include "tt.h"

#include "tt.h"





#include "iwl-test.h"



/* CT-KILL constants */

/* CT-KILL constants */

#define CT_KILL_THRESHOLD_LEGACY   110 /* in Celsius */

#define CT_KILL_THRESHOLD_LEGACY   110 /* in Celsius */

#define CT_KILL_THRESHOLD	   114 /* in Celsius */

#define CT_KILL_THRESHOLD	   114 /* in Celsius */
@@ -691,10 +689,6 @@ struct iwl_priv { 
	struct iwl_spectrum_notification measure_report;

	struct iwl_spectrum_notification measure_report;

	u8 measurement_status;

	u8 measurement_status;





#define IWL_OWNERSHIP_DRIVER	0

#define IWL_OWNERSHIP_TM	1

	u8 ucode_owner;



	/* ucode beacon time */

	/* ucode beacon time */

	u32 ucode_beacon_time;

	u32 ucode_beacon_time;

	int missed_beacon_threshold;

	int missed_beacon_threshold;
@@ -889,7 +883,7 @@ struct iwl_priv { 
#endif /* CONFIG_IWLWIFI_DEBUGFS */

#endif /* CONFIG_IWLWIFI_DEBUGFS */





	struct iwl_nvm_data *nvm_data;

	struct iwl_nvm_data *nvm_data;

	/* eeprom blob for debugfs/testmode */

	/* eeprom blob for debugfs */

	u8 *eeprom_blob;

	u8 *eeprom_blob;

	size_t eeprom_blob_size;

	size_t eeprom_blob_size;
@@ -905,11 +899,6 @@ struct iwl_priv { 
	unsigned long blink_on, blink_off;

	unsigned long blink_on, blink_off;

	bool led_registered;

	bool led_registered;





#ifdef CONFIG_IWLWIFI_DEVICE_TESTMODE

	struct iwl_test tst;

	u32 tm_fixed_rate;

#endif



	/* WoWLAN GTK rekey data */

	/* WoWLAN GTK rekey data */

	u8 kck[NL80211_KCK_LEN], kek[NL80211_KEK_LEN];

	u8 kck[NL80211_KCK_LEN], kek[NL80211_KEK_LEN];

	__le64 replay_ctr;

	__le64 replay_ctr;