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

Commit 60c2ce2b authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

parents 0e90ed0e 690b0cac

drivers/net/wireless/ath/ath5k/eeprom.c

+3 −5
Original line number Diff line number Diff line
@@ -691,15 +691,13 @@ ath5k_eeprom_free_pcal_info(struct ath5k_hw *ah, int mode) 
		if (!chinfo[pier].pd_curves)

			continue;



		for (pdg = 0; pdg < ee->ee_pd_gains[mode]; pdg++) {

		for (pdg = 0; pdg < AR5K_EEPROM_N_PD_CURVES; pdg++) {

			struct ath5k_pdgain_info *pd =

					&chinfo[pier].pd_curves[pdg];



			if (pd != NULL) {

			kfree(pd->pd_step);

			kfree(pd->pd_pwr);

		}

		}



		kfree(chinfo[pier].pd_curves);

	}

drivers/net/wireless/ath/ath9k/pci.c

+6 −0
Original line number Diff line number Diff line
@@ -278,6 +278,12 @@ static int ath_pci_suspend(struct device *device) 


	ath9k_hw_set_gpio(sc->sc_ah, sc->sc_ah->led_pin, 1);



	/* The device has to be moved to FULLSLEEP forcibly.

	 * Otherwise the chip never moved to full sleep,

	 * when no interface is up.

	 */

	ath9k_hw_setpower(sc->sc_ah, ATH9K_PM_FULL_SLEEP);



	return 0;

}

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

+3 −2
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <net/mac80211.h>

#include <linux/etherdevice.h>

#include <asm/unaligned.h>

#include <linux/stringify.h>



#include "iwl-eeprom.h"

#include "iwl-dev.h"
@@ -55,10 +56,10 @@ 
#define IWL100_UCODE_API_MIN 5



#define IWL1000_FW_PRE "iwlwifi-1000-"

#define IWL1000_MODULE_FIRMWARE(api) IWL1000_FW_PRE #api ".ucode"

#define IWL1000_MODULE_FIRMWARE(api) IWL1000_FW_PRE __stringify(api) ".ucode"



#define IWL100_FW_PRE "iwlwifi-100-"

#define IWL100_MODULE_FIRMWARE(api) IWL100_FW_PRE #api ".ucode"

#define IWL100_MODULE_FIRMWARE(api) IWL100_FW_PRE __stringify(api) ".ucode"





/*

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

+4 −3
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <net/mac80211.h>

#include <linux/etherdevice.h>

#include <asm/unaligned.h>

#include <linux/stringify.h>



#include "iwl-eeprom.h"

#include "iwl-dev.h"
@@ -58,13 +59,13 @@ 
#define IWL105_UCODE_API_MIN 5



#define IWL2030_FW_PRE "iwlwifi-2030-"

#define IWL2030_MODULE_FIRMWARE(api) IWL2030_FW_PRE #api ".ucode"

#define IWL2030_MODULE_FIRMWARE(api) IWL2030_FW_PRE __stringify(api) ".ucode"



#define IWL2000_FW_PRE "iwlwifi-2000-"

#define IWL2000_MODULE_FIRMWARE(api) IWL2000_FW_PRE #api ".ucode"

#define IWL2000_MODULE_FIRMWARE(api) IWL2000_FW_PRE __stringify(api) ".ucode"



#define IWL105_FW_PRE "iwlwifi-105-"

#define IWL105_MODULE_FIRMWARE(api) IWL105_FW_PRE #api ".ucode"

#define IWL105_MODULE_FIRMWARE(api) IWL105_FW_PRE __stringify(api) ".ucode"



static void iwl2000_set_ct_threshold(struct iwl_priv *priv)

{

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

+3 −2
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <net/mac80211.h>

#include <linux/etherdevice.h>

#include <asm/unaligned.h>

#include <linux/stringify.h>



#include "iwl-eeprom.h"

#include "iwl-dev.h"
@@ -57,10 +58,10 @@ 
#define IWL5150_UCODE_API_MIN 1



#define IWL5000_FW_PRE "iwlwifi-5000-"

#define IWL5000_MODULE_FIRMWARE(api) IWL5000_FW_PRE #api ".ucode"

#define IWL5000_MODULE_FIRMWARE(api) IWL5000_FW_PRE __stringify(api) ".ucode"



#define IWL5150_FW_PRE "iwlwifi-5150-"

#define IWL5150_MODULE_FIRMWARE(api) IWL5150_FW_PRE #api ".ucode"

#define IWL5150_MODULE_FIRMWARE(api) IWL5150_FW_PRE __stringify(api) ".ucode"



/* NIC configuration for 5000 series */

static void iwl5000_nic_config(struct iwl_priv *priv)