Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 (5ca6f7c8) · Commits · e / devices / android_kernel_xiaomi_markw

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

+21 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,7 @@
		#include <linux/netdevice.h>
		#include <linux/cache.h>
		#include <linux/pci.h>
		#include <linux/pci-aspm.h>
		#include <linux/ethtool.h>
		#include <linux/uaccess.h>
		#include <linux/slab.h>
		@@ -476,6 +477,26 @@ ath5k_pci_probe(struct pci_dev *pdev,
		int ret;
		u8 csz;

		/*
		* L0s needs to be disabled on all ath5k cards.
		*
		* For distributions shipping with CONFIG_PCIEASPM (this will be enabled
		* by default in the future in 2.6.36) this will also mean both L1 and
		* L0s will be disabled when a pre 1.1 PCIe device is detected. We do
		* know L1 works correctly even for all ath5k pre 1.1 PCIe devices
		* though but cannot currently undue the effect of a blacklist, for
		* details you can read pcie_aspm_sanity_check() and see how it adjusts
		* the device link capability.
		*
		* It may be possible in the future to implement some PCI API to allow
		* drivers to override blacklists for pre 1.1 PCIe but for now it is
		* best to accept that both L0s and L1 will be disabled completely for
		* distributions shipping with CONFIG_PCIEASPM rather than having this
		* issue present. Motivation for adding this new API will be to help
		* with power consumption for some of these devices.
		*/
		pci_disable_link_state(pdev, PCIE_LINK_STATE_L0S);

		ret = pci_enable_device(pdev);
		if (ret) {
		dev_err(&pdev->dev, "can't enable device\n");

+1 −0

Original line number	Diff line number	Diff line
		@@ -191,6 +191,7 @@
		#define AR9287_EEP_NO_BACK_VER AR9287_EEP_MINOR_VER_1

		#define AR9287_EEP_START_LOC 128
		#define AR9287_HTC_EEP_START_LOC 256
		#define AR9287_NUM_2G_CAL_PIERS 3
		#define AR9287_NUM_2G_CCK_TARGET_POWERS 3
		#define AR9287_NUM_2G_20_TARGET_POWERS 3

+6 −1

Original line number	Diff line number	Diff line
		@@ -34,9 +34,14 @@ static bool ath9k_hw_ar9287_fill_eeprom(struct ath_hw *ah)
		struct ar9287_eeprom *eep = &ah->eeprom.map9287;
		struct ath_common *common = ath9k_hw_common(ah);
		u16 *eep_data;
		int addr, eep_start_loc = AR9287_EEP_START_LOC;
		int addr, eep_start_loc;
		eep_data = (u16 *)eep;

		if (ah->hw_version.devid == 0x7015)
		eep_start_loc = AR9287_HTC_EEP_START_LOC;
		else
		eep_start_loc = AR9287_EEP_START_LOC;

		if (!ath9k_hw_use_flash(ah)) {
		ath_print(common, ATH_DBG_EEPROM,
		"Reading from EEPROM, not flash\n");

+2 −6

Original line number	Diff line number	Diff line
		@@ -799,7 +799,7 @@ static int ath9k_hif_usb_download_fw(struct hif_device_usb *hif_dev)
		}
		kfree(buf);

		if (hif_dev->device_id == 0x7010)
		if ((hif_dev->device_id == 0x7010) \|\| (hif_dev->device_id == 0x7015))
		firm_offset = AR7010_FIRMWARE_TEXT;
		else
		firm_offset = AR9271_FIRMWARE_TEXT;
		@@ -901,6 +901,7 @@ static int ath9k_hif_usb_probe(struct usb_interface *interface,

		switch(hif_dev->device_id) {
		case 0x7010:
		case 0x7015:
		case 0x9018:
		if (le16_to_cpu(udev->descriptor.bcdDevice) == 0x0202)
		hif_dev->fw_name = FIRMWARE_AR7010_1_1;
		@@ -912,11 +913,6 @@ static int ath9k_hif_usb_probe(struct usb_interface *interface,
		break;
		}

		if (!hif_dev->fw_name) {
		dev_err(&udev->dev, "Can't determine firmware !\n");
		goto err_htc_hw_alloc;
		}

		ret = ath9k_hif_usb_dev_init(hif_dev);
		if (ret) {
		ret = -EINVAL;

+1 −0

Original line number	Diff line number	Diff line
		@@ -245,6 +245,7 @@ static int ath9k_init_htc_services(struct ath9k_htc_priv *priv, u16 devid)

		switch(devid) {
		case 0x7010:
		case 0x7015:
		case 0x9018:
		priv->htc->credits = 45;
		break;