Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next (816a7854) · Commits · e / devices / android_kernel_samsung_exynos5433

Documentation/DocBook/80211.tmpl

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -516,7 +516,7 @@
	!Finclude/net/mac80211.h ieee80211_start_tx_ba_cb_irqsafe		!Finclude/net/mac80211.h ieee80211_start_tx_ba_cb_irqsafe
	!Finclude/net/mac80211.h ieee80211_stop_tx_ba_session		!Finclude/net/mac80211.h ieee80211_stop_tx_ba_session
	!Finclude/net/mac80211.h ieee80211_stop_tx_ba_cb_irqsafe		!Finclude/net/mac80211.h ieee80211_stop_tx_ba_cb_irqsafe
	!Finclude/net/mac80211.h rate_control_changed		!Finclude/net/mac80211.h ieee80211_rate_control_changed
	!Finclude/net/mac80211.h ieee80211_tx_rate_control		!Finclude/net/mac80211.h ieee80211_tx_rate_control
	!Finclude/net/mac80211.h rate_control_send_low		!Finclude/net/mac80211.h rate_control_send_low
	</chapter>		</chapter>

Documentation/networking/mac80211-auth-assoc-deauth.txt

+3 −7

Original line number	Original line	Diff line number	Diff line
	@@ -23,7 +23,7 @@ BA session stop & deauth/disassoc frames
	end note		end note
	end		end

	mac80211->driver: config(channel, non-HT)		mac80211->driver: config(channel, channel type)
	mac80211->driver: bss_info_changed(set BSSID, basic rate bitmap)		mac80211->driver: bss_info_changed(set BSSID, basic rate bitmap)
	mac80211->driver: sta_state(AP, exists)		mac80211->driver: sta_state(AP, exists)

	@@ -51,7 +51,7 @@ note over mac80211,driver: cleanup like for authenticate
	end		end

	alt not previously authenticated (FT)		alt not previously authenticated (FT)
	mac80211->driver: config(channel, non-HT)		mac80211->driver: config(channel, channel type)
	mac80211->driver: bss_info_changed(set BSSID, basic rate bitmap)		mac80211->driver: bss_info_changed(set BSSID, basic rate bitmap)
	mac80211->driver: sta_state(AP, exists)		mac80211->driver: sta_state(AP, exists)
	mac80211->driver: sta_state(AP, authenticated)		mac80211->driver: sta_state(AP, authenticated)
	@@ -67,10 +67,6 @@ end

	mac80211->driver: set up QoS parameters		mac80211->driver: set up QoS parameters

	alt is HT channel
	mac80211->driver: config(channel, HT params)
	end

	mac80211->driver: bss_info_changed(QoS, HT, associated with AID)		mac80211->driver: bss_info_changed(QoS, HT, associated with AID)
	mac80211->userspace: associated		mac80211->userspace: associated

	@@ -95,5 +91,5 @@ mac80211->driver: sta_state(AP,exists)
	mac80211->driver: sta_state(AP,not-exists)		mac80211->driver: sta_state(AP,not-exists)
	mac80211->driver: turn off powersave		mac80211->driver: turn off powersave
	mac80211->driver: bss_info_changed(clear BSSID, not associated, no QoS, ...)		mac80211->driver: bss_info_changed(clear BSSID, not associated, no QoS, ...)
	mac80211->driver: config(non-HT channel type)		mac80211->driver: config(channel type to non-HT)
	mac80211->userspace: disconnected		mac80211->userspace: disconnected

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

+19 −25

Original line number	Original line	Diff line number	Diff line
	@@ -14,6 +14,8 @@
	* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.		* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
	*/		*/

			#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

	#include "ath5k.h"		#include "ath5k.h"
	#include "reg.h"		#include "reg.h"
	#include "debug.h"		#include "debug.h"
	@@ -728,32 +730,24 @@ void
	ath5k_ani_print_counters(struct ath5k_hw *ah)		ath5k_ani_print_counters(struct ath5k_hw *ah)
	{		{
	/* clears too */		/* clears too */
	printk(KERN_NOTICE "ACK fail\t%d\n",		pr_notice("ACK fail\t%d\n", ath5k_hw_reg_read(ah, AR5K_ACK_FAIL));
	ath5k_hw_reg_read(ah, AR5K_ACK_FAIL));		pr_notice("RTS fail\t%d\n", ath5k_hw_reg_read(ah, AR5K_RTS_FAIL));
	printk(KERN_NOTICE "RTS fail\t%d\n",		pr_notice("RTS success\t%d\n", ath5k_hw_reg_read(ah, AR5K_RTS_OK));
	ath5k_hw_reg_read(ah, AR5K_RTS_FAIL));		pr_notice("FCS error\t%d\n", ath5k_hw_reg_read(ah, AR5K_FCS_FAIL));
	printk(KERN_NOTICE "RTS success\t%d\n",
	ath5k_hw_reg_read(ah, AR5K_RTS_OK));
	printk(KERN_NOTICE "FCS error\t%d\n",
	ath5k_hw_reg_read(ah, AR5K_FCS_FAIL));

	/* no clear */		/* no clear */
	printk(KERN_NOTICE "tx\t%d\n",		pr_notice("tx\t%d\n", ath5k_hw_reg_read(ah, AR5K_PROFCNT_TX));
	ath5k_hw_reg_read(ah, AR5K_PROFCNT_TX));		pr_notice("rx\t%d\n", ath5k_hw_reg_read(ah, AR5K_PROFCNT_RX));
	printk(KERN_NOTICE "rx\t%d\n",		pr_notice("busy\t%d\n", ath5k_hw_reg_read(ah, AR5K_PROFCNT_RXCLR));
	ath5k_hw_reg_read(ah, AR5K_PROFCNT_RX));		pr_notice("cycles\t%d\n", ath5k_hw_reg_read(ah, AR5K_PROFCNT_CYCLE));
	printk(KERN_NOTICE "busy\t%d\n",
	ath5k_hw_reg_read(ah, AR5K_PROFCNT_RXCLR));		pr_notice("AR5K_PHYERR_CNT1\t%d\n",
	printk(KERN_NOTICE "cycles\t%d\n",
	ath5k_hw_reg_read(ah, AR5K_PROFCNT_CYCLE));

	printk(KERN_NOTICE "AR5K_PHYERR_CNT1\t%d\n",
	ath5k_hw_reg_read(ah, AR5K_PHYERR_CNT1));		ath5k_hw_reg_read(ah, AR5K_PHYERR_CNT1));
	printk(KERN_NOTICE "AR5K_PHYERR_CNT2\t%d\n",		pr_notice("AR5K_PHYERR_CNT2\t%d\n",
	ath5k_hw_reg_read(ah, AR5K_PHYERR_CNT2));		ath5k_hw_reg_read(ah, AR5K_PHYERR_CNT2));
	printk(KERN_NOTICE "AR5K_OFDM_FIL_CNT\t%d\n",		pr_notice("AR5K_OFDM_FIL_CNT\t%d\n",
	ath5k_hw_reg_read(ah, AR5K_OFDM_FIL_CNT));		ath5k_hw_reg_read(ah, AR5K_OFDM_FIL_CNT));
	printk(KERN_NOTICE "AR5K_CCK_FIL_CNT\t%d\n",		pr_notice("AR5K_CCK_FIL_CNT\t%d\n",
	ath5k_hw_reg_read(ah, AR5K_CCK_FIL_CNT));		ath5k_hw_reg_read(ah, AR5K_CCK_FIL_CNT));
	}		}

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

+16 −13

Original line number	Original line	Diff line number	Diff line
	@@ -77,14 +77,17 @@
	\****************************/		\****************************/

	#define ATH5K_PRINTF(fmt, ...) \		#define ATH5K_PRINTF(fmt, ...) \
	printk(KERN_WARNING "%s: " fmt, __func__, ##__VA_ARGS__)		pr_warn("%s: " fmt, __func__, ##__VA_ARGS__)

			void __printf(3, 4)
			_ath5k_printk(const struct ath5k_hw ah, const char level,
			const char *fmt, ...);

	#define ATH5K_PRINTK(_sc, _level, _fmt, ...) \		#define ATH5K_PRINTK(_sc, _level, _fmt, ...) \
	printk(_level "ath5k %s: " _fmt, \		_ath5k_printk(_sc, _level, _fmt, ##__VA_ARGS__)
	((_sc) && (_sc)->hw) ? wiphy_name((_sc)->hw->wiphy) : "", \
	##__VA_ARGS__)

	#define ATH5K_PRINTK_LIMIT(_sc, _level, _fmt, ...) do { \		#define ATH5K_PRINTK_LIMIT(_sc, _level, _fmt, ...) \
			do { \
	if (net_ratelimit()) \		if (net_ratelimit()) \
	ATH5K_PRINTK(_sc, _level, _fmt, ##__VA_ARGS__); \		ATH5K_PRINTK(_sc, _level, _fmt, ##__VA_ARGS__); \
	} while (0)		} while (0)

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

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -20,6 +20,8 @@
	* Attach/Detach Functions and helpers *		* Attach/Detach Functions and helpers *
	\*************************************/		\*************************************/

			#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

	#include <linux/pci.h>		#include <linux/pci.h>
	#include <linux/slab.h>		#include <linux/slab.h>
	#include "ath5k.h"		#include "ath5k.h"