Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem (b4d3de8c) · Commits · e / devices / android_kernel_samsung_universal8895

drivers/net/wireless/ath/ath.h

+24 −24

Original line number	Original line	Diff line number	Diff line
	@@ -178,23 +178,29 @@ bool ath_hw_keyreset(struct ath_common *common, u16 entry);
	void ath_hw_cycle_counters_update(struct ath_common *common);		void ath_hw_cycle_counters_update(struct ath_common *common);
	int32_t ath_hw_get_listen_time(struct ath_common *common);		int32_t ath_hw_get_listen_time(struct ath_common *common);

	extern __attribute__ ((format (printf, 3, 4))) int		extern __attribute__((format (printf, 2, 3)))
	ath_printk(const char level, struct ath_common common, const char *fmt, ...);		void ath_printk(const char level, const char fmt, ...);

			#define _ath_printk(level, common, fmt, ...) \
			do { \
			__always_unused struct ath_common *unused = common; \
			ath_printk(level, fmt, ##__VA_ARGS__); \
			} while (0)

	#define ath_emerg(common, fmt, ...) \		#define ath_emerg(common, fmt, ...) \
	ath_printk(KERN_EMERG, common, fmt, ##__VA_ARGS__)		_ath_printk(KERN_EMERG, common, fmt, ##__VA_ARGS__)
	#define ath_alert(common, fmt, ...) \		#define ath_alert(common, fmt, ...) \
	ath_printk(KERN_ALERT, common, fmt, ##__VA_ARGS__)		_ath_printk(KERN_ALERT, common, fmt, ##__VA_ARGS__)
	#define ath_crit(common, fmt, ...) \		#define ath_crit(common, fmt, ...) \
	ath_printk(KERN_CRIT, common, fmt, ##__VA_ARGS__)		_ath_printk(KERN_CRIT, common, fmt, ##__VA_ARGS__)
	#define ath_err(common, fmt, ...) \		#define ath_err(common, fmt, ...) \
	ath_printk(KERN_ERR, common, fmt, ##__VA_ARGS__)		_ath_printk(KERN_ERR, common, fmt, ##__VA_ARGS__)
	#define ath_warn(common, fmt, ...) \		#define ath_warn(common, fmt, ...) \
	ath_printk(KERN_WARNING, common, fmt, ##__VA_ARGS__)		_ath_printk(KERN_WARNING, common, fmt, ##__VA_ARGS__)
	#define ath_notice(common, fmt, ...) \		#define ath_notice(common, fmt, ...) \
	ath_printk(KERN_NOTICE, common, fmt, ##__VA_ARGS__)		_ath_printk(KERN_NOTICE, common, fmt, ##__VA_ARGS__)
	#define ath_info(common, fmt, ...) \		#define ath_info(common, fmt, ...) \
	ath_printk(KERN_INFO, common, fmt, ##__VA_ARGS__)		_ath_printk(KERN_INFO, common, fmt, ##__VA_ARGS__)

	/**		/**
	* enum ath_debug_level - atheros wireless debug level		* enum ath_debug_level - atheros wireless debug level
	@@ -247,26 +253,20 @@ enum ATH_DEBUG {
	#ifdef CONFIG_ATH_DEBUG		#ifdef CONFIG_ATH_DEBUG

	#define ath_dbg(common, dbg_mask, fmt, ...) \		#define ath_dbg(common, dbg_mask, fmt, ...) \
	({ \		do { \
	int rtn; \
	if ((common)->debug_mask & dbg_mask) \		if ((common)->debug_mask & dbg_mask) \
	rtn = ath_printk(KERN_DEBUG, common, fmt, \		_ath_printk(KERN_DEBUG, common, fmt, ##__VA_ARGS__); \
	##__VA_ARGS__); \		} while (0)
	else \
	rtn = 0; \
	\
	rtn; \
	})
	#define ATH_DBG_WARN(foo, arg...) WARN(foo, arg)		#define ATH_DBG_WARN(foo, arg...) WARN(foo, arg)
	#define ATH_DBG_WARN_ON_ONCE(foo) WARN_ON_ONCE(foo)		#define ATH_DBG_WARN_ON_ONCE(foo) WARN_ON_ONCE(foo)

	#else		#else

	static inline __attribute__ ((format (printf, 3, 4))) int		static inline __attribute__((format (printf, 3, 4)))
	ath_dbg(struct ath_common *common, enum ATH_DEBUG dbg_mask,		void ath_dbg(struct ath_common *common, enum ATH_DEBUG dbg_mask,
	const char *fmt, ...)		const char *fmt, ...)
	{		{
	return 0;
	}		}
	#define ATH_DBG_WARN(foo, arg...) do {} while (0)		#define ATH_DBG_WARN(foo, arg...) do {} while (0)
	#define ATH_DBG_WARN_ON_ONCE(foo) ({ \		#define ATH_DBG_WARN_ON_ONCE(foo) ({ \

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -643,7 +643,7 @@ static bool ath9k_hw_ani_read_counters(struct ath_hw *ah)
	listenTime = ath_hw_get_listen_time(common);		listenTime = ath_hw_get_listen_time(common);

	if (listenTime <= 0) {		if (listenTime <= 0) {
	ah->stats.ast_ani_lneg++;		ah->stats.ast_ani_lneg_or_lzero++;
	ath9k_ani_restart(ah);		ath9k_ani_restart(ah);
	return false;		return false;
	}		}

drivers/net/wireless/ath/ath9k/ani.h

+1 −4

Original line number	Original line	Diff line number	Diff line
	@@ -148,8 +148,7 @@ struct ar5416Stats {
	u32 ast_ani_ofdmerrs;		u32 ast_ani_ofdmerrs;
	u32 ast_ani_cckerrs;		u32 ast_ani_cckerrs;
	u32 ast_ani_reset;		u32 ast_ani_reset;
	u32 ast_ani_lzero;		u32 ast_ani_lneg_or_lzero;
	u32 ast_ani_lneg;
	u32 avgbrssi;		u32 avgbrssi;
	struct ath9k_mib_stats ast_mibstats;		struct ath9k_mib_stats ast_mibstats;
	};		};
	@@ -159,7 +158,5 @@ void ath9k_enable_mib_counters(struct ath_hw *ah);
	void ath9k_hw_disable_mib_counters(struct ath_hw *ah);		void ath9k_hw_disable_mib_counters(struct ath_hw *ah);
	void ath9k_hw_ani_setup(struct ath_hw *ah);		void ath9k_hw_ani_setup(struct ath_hw *ah);
	void ath9k_hw_ani_init(struct ath_hw *ah);		void ath9k_hw_ani_init(struct ath_hw *ah);
	int ath9k_hw_get_ani_channel_idx(struct ath_hw *ah,
	struct ath9k_channel *chan);

	#endif /* ANI_H */		#endif /* ANI_H */

drivers/net/wireless/ath/ath9k/ar9002_mac.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -273,7 +273,7 @@ static int ar9002_hw_proc_txdesc(struct ath_hw ah, void ds,

	static void ar9002_hw_set11n_txdesc(struct ath_hw ah, void ds,		static void ar9002_hw_set11n_txdesc(struct ath_hw ah, void ds,
	u32 pktLen, enum ath9k_pkt_type type,		u32 pktLen, enum ath9k_pkt_type type,
	u32 txPower, u32 keyIx,		u32 txPower, u8 keyIx,
	enum ath9k_key_type keyType, u32 flags)		enum ath9k_key_type keyType, u32 flags)
	{		{
	struct ar5416_desc *ads = AR5416DESC(ds);		struct ar5416_desc *ads = AR5416DESC(ds);

drivers/net/wireless/ath/ath9k/ar9003_eeprom.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3318,7 +3318,7 @@ static int ar9300_eeprom_restore_internal(struct ath_hw *ah,

	word = kzalloc(2048, GFP_KERNEL);		word = kzalloc(2048, GFP_KERNEL);
	if (!word)		if (!word)
	return -1;		return -ENOMEM;

	memcpy(mptr, &ar9300_default, mdata_size);		memcpy(mptr, &ar9300_default, mdata_size);