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

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

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
parents 4c1d8d06 0d4e6717

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -8500,7 +8500,7 @@ F: drivers/usb/gadget/*uvc*.c 
F:	drivers/usb/gadget/webcam.c



USB WIRELESS RNDIS DRIVER (rndis_wlan)

M:	Jussi Kivilinna <jussi.kivilinna@mbnet.fi>

M:	Jussi Kivilinna <jussi.kivilinna@iki.fi>

L:	linux-wireless@vger.kernel.org

S:	Maintained

F:	drivers/net/wireless/rndis_wlan.c

drivers/bcma/core.c

+7 −1
Original line number Diff line number Diff line
@@ -104,7 +104,13 @@ void bcma_core_pll_ctl(struct bcma_device *core, u32 req, u32 status, bool on) 
		if (i)

			bcma_err(core->bus, "PLL enable timeout\n");

	} else {

		bcma_warn(core->bus, "Disabling PLL not supported yet!\n");

		/*

		 * Mask the PLL but don't wait for it to be disabled. PLL may be

		 * shared between cores and will be still up if there is another

		 * core using it.

		 */

		bcma_mask32(core, BCMA_CLKCTLST, ~req);

		bcma_read32(core, BCMA_CLKCTLST);

	}

}

EXPORT_SYMBOL_GPL(bcma_core_pll_ctl);

drivers/bcma/main.c

+5 −0
Original line number Diff line number Diff line
@@ -120,6 +120,11 @@ static int bcma_register_cores(struct bcma_bus *bus) 
			continue;

		}



		/* Only first GMAC core on BCM4706 is connected and working */

		if (core->id.id == BCMA_CORE_4706_MAC_GBIT &&

		    core->core_unit > 0)

			continue;



		core->dev.release = bcma_release_core_dev;

		core->dev.bus = &bcma_bus_type;

		dev_set_name(&core->dev, "bcma%d:%d", bus->num, dev_id);

drivers/net/wireless/ath/ath5k/ath5k.h

+2 −1
Original line number Diff line number Diff line
@@ -1523,7 +1523,8 @@ int ath5k_hw_dma_stop(struct ath5k_hw *ah); 
/* EEPROM access functions */

int ath5k_eeprom_init(struct ath5k_hw *ah);

void ath5k_eeprom_detach(struct ath5k_hw *ah);



int ath5k_eeprom_mode_from_channel(struct ath5k_hw *ah,

		struct ieee80211_channel *channel);



/* Protocol Control Unit Functions */

/* Helpers */

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

+4 −2
Original line number Diff line number Diff line
@@ -1779,7 +1779,8 @@ ath5k_eeprom_detach(struct ath5k_hw *ah) 
}



int

ath5k_eeprom_mode_from_channel(struct ieee80211_channel *channel)

ath5k_eeprom_mode_from_channel(struct ath5k_hw *ah,

		struct ieee80211_channel *channel)

{

	switch (channel->hw_value) {

	case AR5K_MODE_11A:
@@ -1789,6 +1790,7 @@ ath5k_eeprom_mode_from_channel(struct ieee80211_channel *channel) 
	case AR5K_MODE_11B:

		return AR5K_EEPROM_MODE_11B;

	default:

		return -1;

		ATH5K_WARN(ah, "channel is not A/B/G!");

		return AR5K_EEPROM_MODE_11A;

	}

}