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

Commit 1d212aa9 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
parents 8c4877a4 b7613370

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -1080,6 +1080,12 @@ S: Supported 
F:	Documentation/aoe/

F:	drivers/block/aoe/



ATHEROS ATH GENERIC UTILITIES

M:	"Luis R. Rodriguez" <lrodriguez@atheros.com>

L:	linux-wireless@vger.kernel.org

S:	Supported

F:	drivers/net/wireless/ath/*



ATHEROS ATH5K WIRELESS DRIVER

M:	Jiri Slaby <jirislaby@gmail.com>

M:	Nick Kossifidis <mickflemm@gmail.com>

drivers/net/wireless/ath/ath.h

+109 −6
Original line number Diff line number Diff line
@@ -104,11 +104,6 @@ enum ath_cipher { 
	ATH_CIPHER_MIC = 127

};



enum ath_drv_info {

	AR7010_DEVICE		= BIT(0),

	AR9287_DEVICE		= BIT(1),

};



/**

 * struct ath_ops - Register read/write operations

 *
@@ -131,6 +126,7 @@ struct ath_bus_ops { 
	void (*read_cachesize)(struct ath_common *common, int *csz);

	bool (*eeprom_read)(struct ath_common *common, u32 off, u16 *data);

	void (*bt_coex_prep)(struct ath_common *common);

	void (*extn_synch_en)(struct ath_common *common);

};



struct ath_common {
@@ -152,7 +148,6 @@ struct ath_common { 
	u8 rx_chainmask;



	u32 rx_bufsize;

	u32 driver_info;



	u32 keymax;

	DECLARE_BITMAP(keymap, ATH_KEYMAX);
@@ -186,4 +181,112 @@ bool ath_hw_keyreset(struct ath_common *common, u16 entry); 
void ath_hw_cycle_counters_update(struct ath_common *common);

int32_t ath_hw_get_listen_time(struct ath_common *common);



extern __attribute__ ((format (printf, 3, 4))) int

ath_printk(const char *level, struct ath_common *common, const char *fmt, ...);



#define ath_emerg(common, fmt, ...)				\

	ath_printk(KERN_EMERG, common, fmt, ##__VA_ARGS__)

#define ath_alert(common, fmt, ...)				\

	ath_printk(KERN_ALERT, common, fmt, ##__VA_ARGS__)

#define ath_crit(common, fmt, ...)				\

	ath_printk(KERN_CRIT, common, fmt, ##__VA_ARGS__)

#define ath_err(common, fmt, ...)				\

	ath_printk(KERN_ERR, common, fmt, ##__VA_ARGS__)

#define ath_warn(common, fmt, ...)				\

	ath_printk(KERN_WARNING, common, fmt, ##__VA_ARGS__)

#define ath_notice(common, fmt, ...)				\

	ath_printk(KERN_NOTICE, common, fmt, ##__VA_ARGS__)

#define ath_info(common, fmt, ...)				\

	ath_printk(KERN_INFO, common, fmt, ##__VA_ARGS__)



/**

 * enum ath_debug_level - atheros wireless debug level

 *

 * @ATH_DBG_RESET: reset processing

 * @ATH_DBG_QUEUE: hardware queue management

 * @ATH_DBG_EEPROM: eeprom processing

 * @ATH_DBG_CALIBRATE: periodic calibration

 * @ATH_DBG_INTERRUPT: interrupt processing

 * @ATH_DBG_REGULATORY: regulatory processing

 * @ATH_DBG_ANI: adaptive noise immunitive processing

 * @ATH_DBG_XMIT: basic xmit operation

 * @ATH_DBG_BEACON: beacon handling

 * @ATH_DBG_CONFIG: configuration of the hardware

 * @ATH_DBG_FATAL: fatal errors, this is the default, DBG_DEFAULT

 * @ATH_DBG_PS: power save processing

 * @ATH_DBG_HWTIMER: hardware timer handling

 * @ATH_DBG_BTCOEX: bluetooth coexistance

 * @ATH_DBG_BSTUCK: stuck beacons

 * @ATH_DBG_ANY: enable all debugging

 *

 * The debug level is used to control the amount and type of debugging output

 * we want to see. Each driver has its own method for enabling debugging and

 * modifying debug level states -- but this is typically done through a

 * module parameter 'debug' along with a respective 'debug' debugfs file

 * entry.

 */

enum ATH_DEBUG {

	ATH_DBG_RESET		= 0x00000001,

	ATH_DBG_QUEUE		= 0x00000002,

	ATH_DBG_EEPROM		= 0x00000004,

	ATH_DBG_CALIBRATE	= 0x00000008,

	ATH_DBG_INTERRUPT	= 0x00000010,

	ATH_DBG_REGULATORY	= 0x00000020,

	ATH_DBG_ANI		= 0x00000040,

	ATH_DBG_XMIT		= 0x00000080,

	ATH_DBG_BEACON		= 0x00000100,

	ATH_DBG_CONFIG		= 0x00000200,

	ATH_DBG_FATAL		= 0x00000400,

	ATH_DBG_PS		= 0x00000800,

	ATH_DBG_HWTIMER		= 0x00001000,

	ATH_DBG_BTCOEX		= 0x00002000,

	ATH_DBG_WMI		= 0x00004000,

	ATH_DBG_BSTUCK		= 0x00008000,

	ATH_DBG_ANY		= 0xffffffff

};



#define ATH_DBG_DEFAULT (ATH_DBG_FATAL)



#ifdef CONFIG_ATH_DEBUG



#define ath_dbg(common, dbg_mask, fmt, ...)			\

({								\

	int rtn;						\

	if ((common)->debug_mask & dbg_mask)			\

		rtn = ath_printk(KERN_DEBUG, common, fmt,	\

				 ##__VA_ARGS__);		\

	else							\

		rtn = 0;					\

								\

	rtn;							\

})

#define ATH_DBG_WARN(foo, arg...) WARN(foo, arg)

#define ATH_DBG_WARN_ON_ONCE(foo) WARN_ON_ONCE(foo)



#else



static inline  __attribute__ ((format (printf, 3, 4))) int

ath_dbg(struct ath_common *common, enum ATH_DEBUG dbg_mask,

	const char *fmt, ...)

{

	return 0;

}

#define ATH_DBG_WARN(foo, arg...) do {} while (0)

#define ATH_DBG_WARN_ON_ONCE(foo) ({				\

	int __ret_warn_once = !!(foo);				\

	unlikely(__ret_warn_once);				\

})



#endif /* CONFIG_ATH_DEBUG */



/** Returns string describing opmode, or NULL if unknown mode. */

#ifdef CONFIG_ATH_DEBUG

const char *ath_opmode_to_string(enum nl80211_iftype opmode);

#else

static inline const char *ath_opmode_to_string(enum nl80211_iftype opmode)

{

	return "UNKNOWN";

}

#endif



#endif /* ATH_H */

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

+63 −40
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ 
#include "reg.h"

#include "debug.h"

#include "ani.h"

#include "../debug.h"



static int modparam_nohwcrypt;

module_param_named(nohwcrypt, modparam_nohwcrypt, bool, S_IRUGO);
@@ -76,7 +75,6 @@ MODULE_AUTHOR("Nick Kossifidis"); 
MODULE_DESCRIPTION("Support for 5xxx series of Atheros 802.11 wireless LAN cards.");

MODULE_SUPPORTED_DEVICE("Atheros 5xxx WLAN cards");

MODULE_LICENSE("Dual BSD/GPL");

MODULE_VERSION("0.6.0 (EXPERIMENTAL)");



static int ath5k_init(struct ieee80211_hw *hw);

static int ath5k_reset(struct ath5k_softc *sc, struct ieee80211_channel *chan,
@@ -1881,7 +1879,8 @@ ath5k_beacon_send(struct ath5k_softc *sc) 
		sc->bmisscount = 0;

	}



	if (sc->opmode == NL80211_IFTYPE_AP && sc->num_ap_vifs > 1) {

	if ((sc->opmode == NL80211_IFTYPE_AP && sc->num_ap_vifs > 1) ||

			sc->opmode == NL80211_IFTYPE_MESH_POINT) {

		u64 tsf = ath5k_hw_get_tsf64(ah);

		u32 tsftu = TSF_TO_TU(tsf);

		int slot = ((tsftu % sc->bintval) * ATH_BCBUF) / sc->bintval;
@@ -1913,8 +1912,9 @@ ath5k_beacon_send(struct ath5k_softc *sc) 
		/* NB: hw still stops DMA, so proceed */

	}



	/* refresh the beacon for AP mode */

	if (sc->opmode == NL80211_IFTYPE_AP)

	/* refresh the beacon for AP or MESH mode */

	if (sc->opmode == NL80211_IFTYPE_AP ||

			sc->opmode == NL80211_IFTYPE_MESH_POINT)

		ath5k_beacon_update(sc->hw, vif);



	ath5k_hw_set_txdp(ah, sc->bhalq, bf->daddr);
@@ -2342,7 +2342,8 @@ ath5k_init_softc(struct ath5k_softc *sc, const struct ath_bus_ops *bus_ops) 
	SET_IEEE80211_DEV(hw, sc->dev);

	hw->flags = IEEE80211_HW_RX_INCLUDES_FCS |

			IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |

		    IEEE80211_HW_SIGNAL_DBM;

			IEEE80211_HW_SIGNAL_DBM |

			IEEE80211_HW_REPORTS_TX_ACK_STATUS;



	hw->wiphy->interface_modes =

		BIT(NL80211_IFTYPE_AP) |
@@ -2653,7 +2654,7 @@ ath5k_reset(struct ath5k_softc *sc, struct ieee80211_channel *chan, 
							bool skip_pcu)

{

	struct ath5k_hw *ah = sc->ah;

	int ret;

	int ret, ani_mode;



	ATH5K_DBG(sc, ATH5K_DEBUG_RESET, "resetting\n");
@@ -2661,9 +2662,17 @@ ath5k_reset(struct ath5k_softc *sc, struct ieee80211_channel *chan, 
	synchronize_irq(sc->irq);

	stop_tasklets(sc);



	if (chan) {

		ath5k_drain_tx_buffs(sc);

	/* Save ani mode and disable ANI durring

	 * reset. If we don't we might get false

	 * PHY error interrupts. */

	ani_mode = ah->ah_sc->ani_state.ani_mode;

	ath5k_ani_init(ah, ATH5K_ANI_MODE_OFF);



	/* We are going to empty hw queues

	 * so we should also free any remaining

	 * tx buffers */

	ath5k_drain_tx_buffs(sc);

	if (chan) {

		sc->curchan = chan;

		sc->curband = &sc->sbands[chan->band];

	}
@@ -2680,12 +2689,12 @@ ath5k_reset(struct ath5k_softc *sc, struct ieee80211_channel *chan, 
		goto err;

	}



	ath5k_ani_init(ah, ah->ah_sc->ani_state.ani_mode);

	ath5k_ani_init(ah, ani_mode);



	ah->ah_cal_next_full = jiffies;

	ah->ah_cal_next_ani = jiffies;

	ah->ah_cal_next_nf = jiffies;

	ewma_init(&ah->ah_beacon_rssi_avg, 1000, 8);

	ewma_init(&ah->ah_beacon_rssi_avg, 1024, 8);



	/*

	 * Change channels and update the h/w rate map if we're switching;
@@ -2790,6 +2799,9 @@ ath5k_init(struct ieee80211_hw *hw) 
		goto err_bhal;

	}



	/* 5211 and 5212 usually support 10 queues but we better rely on the

	 * capability information */

	if (ah->ah_capabilities.cap_queues.q_tx_num >= 6) {

		/* This order matches mac80211's queue priority, so we can

		* directly use the mac80211 queue number without any mapping */

		txq = ath5k_txq_setup(sc, AR5K_TX_QUEUE_DATA, AR5K_WME_AC_VO);
@@ -2817,6 +2829,16 @@ ath5k_init(struct ieee80211_hw *hw) 
			goto err_queues;

		}

		hw->queues = 4;

	} else {

		/* older hardware (5210) can only support one data queue */

		txq = ath5k_txq_setup(sc, AR5K_TX_QUEUE_DATA, AR5K_WME_AC_BE);

		if (IS_ERR(txq)) {

			ATH5K_ERR(sc, "can't setup xmit queue\n");

			ret = PTR_ERR(txq);

			goto err_queues;

		}

		hw->queues = 1;

	}



	tasklet_init(&sc->rxtq, ath5k_tasklet_rx, (unsigned long)sc);

	tasklet_init(&sc->txtq, ath5k_tasklet_tx, (unsigned long)sc);
@@ -2977,7 +2999,8 @@ static int ath5k_add_interface(struct ieee80211_hw *hw, 


	/* Assign the vap/adhoc to a beacon xmit slot. */

	if ((avf->opmode == NL80211_IFTYPE_AP) ||

	    (avf->opmode == NL80211_IFTYPE_ADHOC)) {

	    (avf->opmode == NL80211_IFTYPE_ADHOC) ||

	    (avf->opmode == NL80211_IFTYPE_MESH_POINT)) {

		int slot;



		WARN_ON(list_empty(&sc->bcbuf));
@@ -2996,7 +3019,7 @@ static int ath5k_add_interface(struct ieee80211_hw *hw, 
		sc->bslot[avf->bslot] = vif;

		if (avf->opmode == NL80211_IFTYPE_AP)

			sc->num_ap_vifs++;

		else

		else if (avf->opmode == NL80211_IFTYPE_ADHOC)

			sc->num_adhoc_vifs++;

	}

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

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ 


#include "base.h"

#include "debug.h"

#include "../debug.h"



static unsigned int ath5k_debug;

module_param_named(debug, ath5k_debug, uint, 0);

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

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static int ath5k_hw_stop_rx_dma(struct ath5k_hw *ah) 
			i--)

		udelay(100);



	if (i)

	if (!i)

		ATH5K_DBG(ah->ah_sc, ATH5K_DEBUG_DMA,

				"failed to stop RX DMA !\n");