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

Commit 0d770a82 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 d294d028 017a6416

drivers/net/wireless/iwlwifi/Kconfig

+8 −4
Original line number Diff line number Diff line
@@ -2,10 +2,6 @@ config IWLWIFI 
	tristate "Intel Wireless WiFi Next Gen AGN - Wireless-N/Advanced-N/Ultimate-N (iwlwifi) "

	depends on PCI && MAC80211 && HAS_IOMEM

	select FW_LOADER

	select NEW_LEDS

	select LEDS_CLASS

	select LEDS_TRIGGERS

	select MAC80211_LEDS

	---help---

	  Select to build the driver supporting the:
@@ -43,6 +39,14 @@ config IWLWIFI 
	  say M here and read <file:Documentation/kbuild/modules.txt>.  The

	  module will be called iwlwifi.



config IWLWIFI_LEDS

	bool

	depends on IWLWIFI

	depends on LEDS_CLASS

	select LEDS_TRIGGERS

	select MAC80211_LEDS

	default y



config IWLDVM

	tristate "Intel Wireless WiFi DVM Firmware support"

	depends on IWLWIFI

drivers/net/wireless/iwlwifi/dvm/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -4,9 +4,10 @@ iwldvm-objs += main.o rs.o mac80211.o ucode.o tx.o 
iwldvm-objs		+= lib.o calib.o tt.o sta.o rx.o



iwldvm-objs		+= power.o

iwldvm-objs		+= scan.o led.o

iwldvm-objs		+= scan.o

iwldvm-objs		+= rxon.o devices.o



iwldvm-$(CONFIG_IWLWIFI_LEDS) += led.o

iwldvm-$(CONFIG_IWLWIFI_DEBUGFS) += debugfs.o



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

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

+2 −0
Original line number Diff line number Diff line
@@ -888,9 +888,11 @@ struct iwl_priv { 


	struct iwl_event_log event_log;



#ifdef CONFIG_IWLWIFI_LEDS

	struct led_classdev led;

	unsigned long blink_on, blink_off;

	bool led_registered;

#endif



	/* WoWLAN GTK rekey data */

	u8 kck[NL80211_KCK_LEN], kek[NL80211_KEK_LEN];

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

+12 −0
Original line number Diff line number Diff line
@@ -36,8 +36,20 @@ struct iwl_priv; 
#define IWL_LED_ACTIVITY       (0<<1)

#define IWL_LED_LINK           (1<<1)



#ifdef CONFIG_IWLWIFI_LEDS

void iwlagn_led_enable(struct iwl_priv *priv);

void iwl_leds_init(struct iwl_priv *priv);

void iwl_leds_exit(struct iwl_priv *priv);

#else

static inline void iwlagn_led_enable(struct iwl_priv *priv)

{

}

static inline void iwl_leds_init(struct iwl_priv *priv)

{

}

static inline void iwl_leds_exit(struct iwl_priv *priv)

{

}

#endif



#endif /* __iwl_leds_h__ */

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

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ 
#define NVM_HW_SECTION_NUM_FAMILY_7000		0



static const struct iwl_base_params iwl7000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_size = OTP_LOW_IMAGE_SIZE_FAMILY_7000,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.pll_cfg_val = 0,

	.shadow_ram_support = true,