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

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

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

Conflicts:
	drivers/net/wireless/ath/ath5k/sysfs.c
	net/bluetooth/l2cap_core.c
	net/mac80211/wpa.c
parents 8ae2e12f 34459512

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

+3 −5
Original line number Diff line number Diff line
@@ -693,15 +693,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/ath5k/pci.c

+5 −2
Original line number Diff line number Diff line
@@ -297,7 +297,9 @@ ath5k_pci_remove(struct pci_dev *pdev) 
#ifdef CONFIG_PM_SLEEP

static int ath5k_pci_suspend(struct device *dev)

{

	struct ath5k_softc *sc = pci_get_drvdata(to_pci_dev(dev));

	struct pci_dev *pdev = to_pci_dev(dev);

	struct ieee80211_hw *hw = pci_get_drvdata(pdev);

	struct ath5k_softc *sc = hw->priv;



	ath5k_led_off(sc);

	return 0;
@@ -306,7 +308,8 @@ static int ath5k_pci_suspend(struct device *dev) 
static int ath5k_pci_resume(struct device *dev)

{

	struct pci_dev *pdev = to_pci_dev(dev);

	struct ath5k_softc *sc = pci_get_drvdata(pdev);

	struct ieee80211_hw *hw = pci_get_drvdata(pdev);

	struct ath5k_softc *sc = hw->priv;



	/*

	 * Suspend/Resume resets the PCI configuration space, so we have to

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

+6 −3
Original line number Diff line number Diff line
@@ -10,7 +10,8 @@ static ssize_t ath5k_attr_show_##name(struct device *dev, \ 
			struct device_attribute *attr,			\

			char *buf)					\

{									\

	struct ath5k_softc *sc = dev_get_drvdata(dev);			\

	struct ieee80211_hw *hw = dev_get_drvdata(dev);			\

	struct ath5k_softc *sc = hw->priv;				\

	return snprintf(buf, PAGE_SIZE, "%d\n", get);			\

}									\

									\
@@ -18,7 +19,8 @@ static ssize_t ath5k_attr_store_##name(struct device *dev, \ 
			struct device_attribute *attr,			\

			const char *buf, size_t count)			\

{									\

	struct ath5k_softc *sc = dev_get_drvdata(dev);			\

	struct ieee80211_hw *hw = dev_get_drvdata(dev);			\

	struct ath5k_softc *sc = hw->priv;				\

	int val, ret;							\

									\

	ret = kstrtoint(buf, 10, &val);					\
@@ -35,7 +37,8 @@ static ssize_t ath5k_attr_show_##name(struct device *dev, \ 
			struct device_attribute *attr,			\

			char *buf)					\

{									\

	struct ath5k_softc *sc = dev_get_drvdata(dev);			\

	struct ieee80211_hw *hw = dev_get_drvdata(dev);			\

	struct ath5k_softc *sc = hw->priv;				\

	return snprintf(buf, PAGE_SIZE, "%d\n", get);			\

}									\

static DEVICE_ATTR(name, S_IRUGO, ath5k_attr_show_##name, NULL)

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/ath/ath9k/xmit.c

+2 −1
Original line number Diff line number Diff line
@@ -661,7 +661,8 @@ static int ath_compute_num_delims(struct ath_softc *sc, struct ath_atx_tid *tid, 
	 * TODO - this could be improved to be dependent on the rate.

	 *      The hardware can keep up at lower rates, but not higher rates

	 */

	if (fi->keyix != ATH9K_TXKEYIX_INVALID)

	if ((fi->keyix != ATH9K_TXKEYIX_INVALID) &&

	    !(sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA))

		ndelim += ATH_AGGR_ENCRYPTDELIM;



	/*