Merge branch 'for-davem' of... (b34870fc) · Commits · e / devices / android_kernel_samsung_universal8895

Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into wireless John W. Linville says: ==================== This is a big pull request for new features intended for the 3.10 stream... Regarding mac80211, Johannes says: "First, I merged mac80211/master to avoid some conflicts. This brings in a bunch of fixes you're already familiar with. For real -next material, I have a whole bunch of minstrel work, minstrel_ht from Felix and legacy minstrel from Thomas (Huehn). The other Thomas (Pedersen) did a number of changes in mesh to allow userspace peering management even when the mesh isn't secured. Stanislaw changes suspend/resume to always disconnect the networks. This is typically already done by network-manager so won't make a huge difference for most users, but fixes a number problems, particularly with USB drivers that can easily disconnect while suspended. Ilan has a small change to allow mac80211 drivers to differentiate remain-on-channel reasons, and Jouni extends nl80211 to allow fast roaming with full-MAC devices. I have a fairly large number of patches as well, many of them fairly simple cleanups, but also allowing split wiphy dumps and adding back the full wiphy information in nl80211, station entry change checking and more VHT work including VHT capability overrides (mostly for testing purposes)." And for iwlwifi, Johannes says: "Here, I also merged iwlwifi-fixes to avoid conflicts, and otherwise have various cleanups and improvements on the MVM driver, along with a few throughout the driver. Other than Bluetooth Coexistence from Emmanuel there's no over-arching theme, so listing them would pretty much reproduce the shortlog." Regarding NFC, Samuel says: "The 2 features we have with this one are: - An LLCP Service Name Lookup (SNL) netlink interface for querying LLCP service availability from user space. Along the way, Thierry also improved the existing SNL interface for aggregating SNL responses. - An initial LLCP socket options implementation, for setting the Receive Window (RW) and the Maximum Information Unit Extension (MIUX) per socket. This is need for the LLCP validation tests. We also have a microread MEI build failure here: I am not sending this one to 3.9 because the MEI bus code is not there yet, so it won't break for anyone else than me." And for ath6kl, Kalle says: "I added tracing support to ath6kl, along with a new Kconfig option. Now there's also a workaround to reset USB devices when the firmware upload fails, this happened when host was warm rebooted. There are also quite a few small fixes or cleanup." On top of all that, there is the usual bundle of driver updates with new features, new hardware support and the like mixed-in. The ath9k, b43, brcmfmac, mwifiex, rt2800, and wil6210 drivers are all well-represented, and a few other drivers are hit as well. I also pulled-in the wireless fixes tree in order to resolve some pending merge conflicts. Please let me know if there are problems! ==================== Signed-off-by:

David S. Miller <davem@davemloft.net>

MAINTAINERS

+1 −1

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

	USB WIRELESS RNDIS DRIVER (rndis_wlan)		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		L: linux-wireless@vger.kernel.org
	S: Maintained		S: Maintained
	F: drivers/net/wireless/rndis_wlan.c		F: drivers/net/wireless/rndis_wlan.c

drivers/bcma/core.c

+7 −1

Original line number	Original line	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)		if (i)
	bcma_err(core->bus, "PLL enable timeout\n");		bcma_err(core->bus, "PLL enable timeout\n");
	} else {		} 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);		EXPORT_SYMBOL_GPL(bcma_core_pll_ctl);

drivers/bcma/main.c

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -120,6 +120,11 @@ static int bcma_register_cores(struct bcma_bus *bus)
	continue;		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.release = bcma_release_core_dev;
	core->dev.bus = &bcma_bus_type;		core->dev.bus = &bcma_bus_type;
	dev_set_name(&core->dev, "bcma%d:%d", bus->num, dev_id);		dev_set_name(&core->dev, "bcma%d:%d", bus->num, dev_id);

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

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1523,7 +1523,8 @@ int ath5k_hw_dma_stop(struct ath5k_hw *ah);
	/* EEPROM access functions */		/* EEPROM access functions */
	int ath5k_eeprom_init(struct ath5k_hw *ah);		int ath5k_eeprom_init(struct ath5k_hw *ah);
	void ath5k_eeprom_detach(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 */		/* Protocol Control Unit Functions */
	/* Helpers */		/* Helpers */

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

+4 −2

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

	int		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) {		switch (channel->hw_value) {
	case AR5K_MODE_11A:		case AR5K_MODE_11A:
	@@ -1789,6 +1790,7 @@ ath5k_eeprom_mode_from_channel(struct ieee80211_channel *channel)
	case AR5K_MODE_11B:		case AR5K_MODE_11B:
	return AR5K_EEPROM_MODE_11B;		return AR5K_EEPROM_MODE_11B;
	default:		default:
	return -1;		ATH5K_WARN(ah, "channel is not A/B/G!");
			return AR5K_EEPROM_MODE_11A;
	}		}
	}		}