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

Commit cc755896 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-2.6 into for-davem

Conflicts:
	drivers/net/wireless/ath/ar9170/main.c
parents d250fe91 9459d59f

drivers/net/wireless/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
menuconfig WLAN

	bool "Wireless LAN"

	depends on !S390

	depends on NET

	select WIRELESS

	default y

	---help---

drivers/net/wireless/ath/ar9170/ar9170.h

+2 −50
Original line number Diff line number Diff line
@@ -109,41 +109,6 @@ struct ar9170_rxstream_mpdu_merge { 
	bool has_plcp;

};



#define AR9170_NUM_TID	16

#define WME_BA_BMP_SIZE         64

#define AR9170_NUM_MAX_AGG_LEN	(2 * WME_BA_BMP_SIZE)



#define WME_AC_BE   2

#define WME_AC_BK   3

#define WME_AC_VI   1

#define WME_AC_VO   0



#define TID_TO_WME_AC(_tid)				\

	((((_tid) == 0) || ((_tid) == 3)) ? WME_AC_BE :	\

	 (((_tid) == 1) || ((_tid) == 2)) ? WME_AC_BK :	\

	 (((_tid) == 4) || ((_tid) == 5)) ? WME_AC_VI :	\

	 WME_AC_VO)



#define BAW_WITHIN(_start, _bawsz, _seqno) \

	((((_seqno) - (_start)) & 0xfff) < (_bawsz))



enum ar9170_tid_state {

	AR9170_TID_STATE_INVALID,

	AR9170_TID_STATE_SHUTDOWN,

	AR9170_TID_STATE_PROGRESS,

	AR9170_TID_STATE_COMPLETE,

};



struct ar9170_sta_tid {

	struct list_head list;

	struct sk_buff_head queue;

	u8 addr[ETH_ALEN];

	u16 ssn;

	u16 tid;

	enum ar9170_tid_state state;

	bool active;

};



struct ar9170_tx_queue_stats {

	unsigned int len;

	unsigned int limit;
@@ -152,12 +117,9 @@ struct ar9170_tx_queue_stats { 


#define AR9170_QUEUE_TIMEOUT		64

#define AR9170_TX_TIMEOUT		8

#define AR9170_BA_TIMEOUT		4

#define AR9170_JANITOR_DELAY		128

#define AR9170_TX_INVALID_RATE		0xffffffff



#define AR9170_NUM_TX_STATUS		128

#define AR9170_NUM_TX_AGG_MAX		30

#define AR9170_NUM_TX_LIMIT_HARD	AR9170_TXQ_DEPTH

#define AR9170_NUM_TX_LIMIT_SOFT	(AR9170_TXQ_DEPTH - 10)
@@ -234,11 +196,6 @@ struct ar9170 { 
	struct sk_buff_head tx_pending[__AR9170_NUM_TXQ];

	struct sk_buff_head tx_status[__AR9170_NUM_TXQ];

	struct delayed_work tx_janitor;

	/* tx ampdu */

	struct sk_buff_head tx_status_ampdu;

	spinlock_t tx_ampdu_list_lock;

	struct list_head tx_ampdu_list;

	atomic_t tx_ampdu_pending;



	/* rxstream mpdu merge */

	struct ar9170_rxstream_mpdu_merge rx_mpdu;
@@ -250,11 +207,6 @@ struct ar9170 { 
	u8 global_ampdu_factor;

};



struct ar9170_sta_info {

	struct ar9170_sta_tid agg[AR9170_NUM_TID];

	unsigned int ampdu_max_len;

};



struct ar9170_tx_info {

	unsigned long timeout;

};

drivers/net/wireless/ath/ar9170/main.c

+10 −548

File changed.

Preview size limit exceeded, changes collapsed.

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

+3 −3
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ ath5k_ani_set_noise_immunity_level(struct ath5k_hw *ah, int level) 
	const s8 hi[] = { -14, -12 };

	const s8 fr[] = { -78, -80 };

#endif

	if (level < 0 || level > ARRAY_SIZE(sz)) {

	if (level < 0 || level >= ARRAY_SIZE(sz)) {

		ATH5K_DBG_UNLIMIT(ah->ah_sc, ATH5K_DEBUG_ANI,

			"level out of range %d", level);

		return;
@@ -104,7 +104,7 @@ ath5k_ani_set_spur_immunity_level(struct ath5k_hw *ah, int level) 
{

	const int val[] = { 2, 4, 6, 8, 10, 12, 14, 16 };



	if (level < 0 || level > ARRAY_SIZE(val) ||

	if (level < 0 || level >= ARRAY_SIZE(val) ||

	    level > ah->ah_sc->ani_state.max_spur_level) {

		ATH5K_DBG_UNLIMIT(ah->ah_sc, ATH5K_DEBUG_ANI,

			"level out of range %d", level);
@@ -129,7 +129,7 @@ ath5k_ani_set_firstep_level(struct ath5k_hw *ah, int level) 
{

	const int val[] = { 0, 4, 8 };



	if (level < 0 || level > ARRAY_SIZE(val)) {

	if (level < 0 || level >= ARRAY_SIZE(val)) {

		ATH5K_DBG_UNLIMIT(ah->ah_sc, ATH5K_DEBUG_ANI,

			"level out of range %d", level);

		return;

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

+102 −102

File changed.

Preview size limit exceeded, changes collapsed.