Merge branch 'master' of... (78ab9527) · Commits · e / devices / android_kernel_teracube_2e

Documentation/DocBook/80211.tmpl

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -65,7 +65,6 @@
	</abstract>		</abstract>
	</setinfo>		</setinfo>
	<book id="cfg80211-developers-guide">		<book id="cfg80211-developers-guide">
	!Ainclude/net/cfg80211.h
	<bookinfo>		<bookinfo>
	<title>The cfg80211 subsystem</title>		<title>The cfg80211 subsystem</title>

MAINTAINERS

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -4304,13 +4304,12 @@ F: Documentation/filesystems/dlmfs.txt
	F: fs/ocfs2/		F: fs/ocfs2/

	ORINOCO DRIVER		ORINOCO DRIVER
	M: Pavel Roskin <proski@gnu.org>
	M: David Gibson <hermes@gibson.dropbear.id.au>
	L: linux-wireless@vger.kernel.org		L: linux-wireless@vger.kernel.org
	L: orinoco-users@lists.sourceforge.net		L: orinoco-users@lists.sourceforge.net
	L: orinoco-devel@lists.sourceforge.net		L: orinoco-devel@lists.sourceforge.net
			W: http://linuxwireless.org/en/users/Drivers/orinoco
	W: http://www.nongnu.org/orinoco/		W: http://www.nongnu.org/orinoco/
	S: Maintained		S: Orphan
	F: drivers/net/wireless/orinoco/		F: drivers/net/wireless/orinoco/

	OSD LIBRARY and FILESYSTEM		OSD LIBRARY and FILESYSTEM
	@@ -6376,7 +6375,7 @@ S: Maintained
	F: drivers/input/misc/wistron_btns.c		F: drivers/input/misc/wistron_btns.c

	WL1251 WIRELESS DRIVER		WL1251 WIRELESS DRIVER
	M: Kalle Valo <kalle.valo@iki.fi>		M: Kalle Valo <kvalo@adurom.com>
	L: linux-wireless@vger.kernel.org		L: linux-wireless@vger.kernel.org
	W: http://wireless.kernel.org		W: http://wireless.kernel.org
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git		T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
	@@ -6391,6 +6390,7 @@ W: http://wireless.kernel.org
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git		T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
	S: Maintained		S: Maintained
	F: drivers/net/wireless/wl12xx/wl1271*		F: drivers/net/wireless/wl12xx/wl1271*
			F: include/linux/spi/wl12xx.h

	WL3501 WIRELESS PCMCIA CARD DRIVER		WL3501 WIRELESS PCMCIA CARD DRIVER
	M: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>		M: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>

drivers/net/wireless/ath/ath.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -119,6 +119,7 @@ struct ath_common {

	u32 keymax;		u32 keymax;
	DECLARE_BITMAP(keymap, ATH_KEYMAX);		DECLARE_BITMAP(keymap, ATH_KEYMAX);
			DECLARE_BITMAP(tkip_keymap, ATH_KEYMAX);
	u8 splitmic;		u8 splitmic;

	struct ath_regulatory regulatory;		struct ath_regulatory regulatory;

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -700,10 +700,10 @@ ath5k_pci_probe(struct pci_dev *pdev,
	return 0;		return 0;
	err_ah:		err_ah:
	ath5k_hw_detach(sc->ah);		ath5k_hw_detach(sc->ah);
	err_irq:
	free_irq(pdev->irq, sc);
	err_free_ah:		err_free_ah:
	kfree(sc->ah);		kfree(sc->ah);
			err_irq:
			free_irq(pdev->irq, sc);
	err_free:		err_free:
	ieee80211_free_hw(hw);		ieee80211_free_hw(hw);
	err_map:		err_map:

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

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -312,6 +312,7 @@ static const struct {
	{ ATH5K_DEBUG_DUMP_TX, "dumptx", "print transmit skb content" },		{ ATH5K_DEBUG_DUMP_TX, "dumptx", "print transmit skb content" },
	{ ATH5K_DEBUG_DUMPBANDS, "dumpbands", "dump bands" },		{ ATH5K_DEBUG_DUMPBANDS, "dumpbands", "dump bands" },
	{ ATH5K_DEBUG_ANI, "ani", "adaptive noise immunity" },		{ ATH5K_DEBUG_ANI, "ani", "adaptive noise immunity" },
			{ ATH5K_DEBUG_DESC, "desc", "descriptor chains" },
	{ ATH5K_DEBUG_ANY, "all", "show all debug levels" },		{ ATH5K_DEBUG_ANY, "all", "show all debug levels" },
	};		};

	@@ -955,7 +956,7 @@ ath5k_debug_printrxbuffs(struct ath5k_softc sc, struct ath5k_hw ah)
	struct ath5k_rx_status rs = {};		struct ath5k_rx_status rs = {};
	int status;		int status;

	if (likely(!(sc->debug.level & ATH5K_DEBUG_RESET)))		if (likely(!(sc->debug.level & ATH5K_DEBUG_DESC)))
	return;		return;

	printk(KERN_DEBUG "rxdp %x, rxlink %p\n",		printk(KERN_DEBUG "rxdp %x, rxlink %p\n",
	@@ -997,7 +998,7 @@ ath5k_debug_printtxbuf(struct ath5k_softc sc, struct ath5k_buf bf)
	struct ath5k_tx_status ts = {};		struct ath5k_tx_status ts = {};
	int done;		int done;

	if (likely(!(sc->debug.level & ATH5K_DEBUG_RESET)))		if (likely(!(sc->debug.level & ATH5K_DEBUG_DESC)))
	return;		return;

	done = sc->ah->ah_proc_tx_desc(sc->ah, bf->desc, &ts);		done = sc->ah->ah_proc_tx_desc(sc->ah, bf->desc, &ts);