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

drivers/net/wireless/Kconfig

+16 −1

Original line number	Diff line number	Diff line
		@@ -214,6 +214,21 @@ config HERMES
		configure your card and that /etc/pcmcia/wireless.opts works :
		<http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>

		config HERMES_CACHE_FW_ON_INIT
		bool "Cache Hermes firmware on driver initialisation"
		depends on HERMES
		default y
		---help---
		Say Y to cache any firmware required by the Hermes drivers
		on startup. The firmware will remain cached until the
		driver is unloaded. The cache uses 64K of RAM.

		Otherwise load the firmware from userspace as required. In
		this case the driver should be unloaded and restarted
		whenever the firmware is changed.

		If you are not sure, say Y.

		config APPLE_AIRPORT
		tristate "Apple Airport support (built-in)"
		depends on PPC_PMAC && HERMES
		@@ -508,7 +523,7 @@ config RTL8180

		config RTL8187
		tristate "Realtek 8187 and 8187B USB support"
		depends on MAC80211 && USB && WLAN_80211 && EXPERIMENTAL
		depends on MAC80211 && USB && WLAN_80211
		select EEPROM_93CX6
		---help---
		This is a driver for RTL8187 and RTL8187B based cards.

drivers/net/wireless/ath5k/ath5k.h

+0 −7

Original line number	Diff line number	Diff line
		@@ -821,13 +821,6 @@ struct ath5k_athchan_2ghz {
		return (false); \
		} while (0)

		enum ath5k_ant_setting {
		AR5K_ANT_VARIABLE = 0, /* variable by programming */
		AR5K_ANT_FIXED_A = 1, /* fixed to 11a frequencies */
		AR5K_ANT_FIXED_B = 2, /* fixed to 11b frequencies */
		AR5K_ANT_MAX = 3,
		};

		/*
		* Hardware interrupt abstraction
		*/

drivers/net/wireless/ath5k/attach.c

+3 −9

Original line number	Diff line number	Diff line
		@@ -106,7 +106,7 @@ struct ath5k_hw ath5k_hw_attach(struct ath5k_softc sc, u8 mac_version)
		{
		struct ath5k_hw *ah;
		struct pci_dev *pdev = sc->pdev;
		u8 mac[ETH_ALEN];
		u8 mac[ETH_ALEN] = {};
		int ret;
		u32 srev;

		@@ -317,15 +317,9 @@ struct ath5k_hw ath5k_hw_attach(struct ath5k_softc sc, u8 mac_version)
		goto err_free;
		}

		/* Set MAC address */
		ret = ath5k_eeprom_read_mac(ah, mac);
		if (ret) {
		ATH5K_ERR(sc, "unable to read address from EEPROM: 0x%04x\n",
		sc->pdev->device);
		goto err_free;
		}

		/* MAC address is cleared until add_interface */
		ath5k_hw_set_lladdr(ah, mac);

		/* Set BSSID to bcast address: ff:ff:ff:ff:ff:ff for now */
		memset(ah->ah_bssid, 0xff, ETH_ALEN);
		ath5k_hw_set_associd(ah, ah->ah_bssid, 0);

drivers/net/wireless/ath5k/base.c

+12 −3

Original line number	Diff line number	Diff line
		@@ -200,7 +200,7 @@ static int ath5k_pci_resume(struct pci_dev *pdev);
		#endif /* CONFIG_PM */

		static struct pci_driver ath5k_pci_driver = {
		.name = "ath5k_pci",
		.name = KBUILD_MODNAME,
		.id_table = ath5k_pci_id_table,
		.probe = ath5k_pci_probe,
		.remove = __devexit_p(ath5k_pci_remove),
		@@ -707,7 +707,7 @@ ath5k_attach(struct pci_dev pdev, struct ieee80211_hw hw)
		{
		struct ath5k_softc *sc = hw->priv;
		struct ath5k_hw *ah = sc->ah;
		u8 mac[ETH_ALEN];
		u8 mac[ETH_ALEN] = {};
		int ret;

		ATH5K_DBG(sc, ATH5K_DEBUG_ANY, "devid 0x%x\n", pdev->device);
		@@ -777,7 +777,13 @@ ath5k_attach(struct pci_dev pdev, struct ieee80211_hw hw)
		tasklet_init(&sc->restq, ath5k_tasklet_reset, (unsigned long)sc);
		setup_timer(&sc->calib_tim, ath5k_calibrate, (unsigned long)sc);

		ath5k_hw_get_lladdr(ah, mac);
		ret = ath5k_eeprom_read_mac(ah, mac);
		if (ret) {
		ATH5K_ERR(sc, "unable to read address from EEPROM: 0x%04x\n",
		sc->pdev->device);
		goto err_queues;
		}

		SET_IEEE80211_PERM_ADDR(hw, mac);
		/* All MAC address bits matter for ACKs */
		memset(sc->bssidmask, 0xff, ETH_ALEN);
		@@ -2765,6 +2771,7 @@ static int ath5k_add_interface(struct ieee80211_hw *hw,
		/* Set to a reasonable value. Note that this will
		* be set to mac80211's value at ath5k_config(). */
		sc->bintval = 1000;
		ath5k_hw_set_lladdr(sc->ah, conf->mac_addr);

		ret = 0;
		end:
		@@ -2777,11 +2784,13 @@ ath5k_remove_interface(struct ieee80211_hw *hw,
		struct ieee80211_if_init_conf *conf)
		{
		struct ath5k_softc *sc = hw->priv;
		u8 mac[ETH_ALEN] = {};

		mutex_lock(&sc->lock);
		if (sc->vif != conf->vif)
		goto end;

		ath5k_hw_set_lladdr(sc->ah, mac);
		sc->vif = NULL;
		end:
		mutex_unlock(&sc->lock);

drivers/net/wireless/ath5k/eeprom.c

+1047 −147

File changed.

Preview size limit exceeded, changes collapsed.