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

Commit e0985f27 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

parents 429a01a7 fc7c976d

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

+1 −1
Original line number Diff line number Diff line
@@ -218,6 +218,7 @@ struct ath_frame_info { 
struct ath_buf_state {

	u8 bf_type;

	u8 bfs_paprd;

	unsigned long bfs_paprd_timestamp;

	enum ath9k_internal_frame_type bfs_ftype;

};
@@ -593,7 +594,6 @@ struct ath_softc { 
	struct work_struct paprd_work;

	struct work_struct hw_check_work;

	struct completion paprd_complete;

	bool paprd_pending;



	u32 intrstatus;

	u32 sc_flags; /* SC_OP_* */

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

+0 −2
Original line number Diff line number Diff line
@@ -342,7 +342,6 @@ static bool ath_paprd_send_frame(struct ath_softc *sc, struct sk_buff *skb, int 
	tx_info->control.rates[1].idx = -1;



	init_completion(&sc->paprd_complete);

	sc->paprd_pending = true;

	txctl.paprd = BIT(chain);



	if (ath_tx_start(hw, skb, &txctl) != 0) {
@@ -353,7 +352,6 @@ static bool ath_paprd_send_frame(struct ath_softc *sc, struct sk_buff *skb, int 


	time_left = wait_for_completion_timeout(&sc->paprd_complete,

			msecs_to_jiffies(ATH_PAPRD_TIMEOUT));

	sc->paprd_pending = false;



	if (!time_left)

		ath_dbg(ath9k_hw_common(sc->sc_ah), ATH_DBG_CALIBRATE,

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

+6 −1
Original line number Diff line number Diff line
@@ -1725,6 +1725,9 @@ static void ath_tx_start_dma(struct ath_softc *sc, struct ath_buf *bf, 
			ar9003_hw_set_paprd_txdesc(sc->sc_ah, bf->bf_desc,

						   bf->bf_state.bfs_paprd);



		if (txctl->paprd)

			bf->bf_state.bfs_paprd_timestamp = jiffies;



		ath_tx_send_normal(sc, txctl->txq, tid, &bf_head);

	}
@@ -1886,7 +1889,9 @@ static void ath_tx_complete_buf(struct ath_softc *sc, struct ath_buf *bf, 
	bf->bf_buf_addr = 0;



	if (bf->bf_state.bfs_paprd) {

		if (!sc->paprd_pending)

		if (time_after(jiffies,

				bf->bf_state.bfs_paprd_timestamp +

				msecs_to_jiffies(ATH_PAPRD_TIMEOUT)))

			dev_kfree_skb_any(skb);

		else

			complete(&sc->paprd_complete);

drivers/net/wireless/ath/carl9170/rx.c

+1 −1
Original line number Diff line number Diff line
@@ -564,7 +564,7 @@ static void carl9170_ps_beacon(struct ar9170 *ar, void *data, unsigned int len) 
	cam = ieee80211_check_tim(tim_ie, tim_len, ar->common.curaid);



	/* 2. Maybe the AP wants to send multicast/broadcast data? */

	cam = !!(tim_ie->bitmap_ctrl & 0x01);

	cam |= !!(tim_ie->bitmap_ctrl & 0x01);



	if (!cam) {

		/* back to low-power land. */

drivers/net/wireless/iwlwifi/iwl-6000.c

+2 −0
Original line number Diff line number Diff line
@@ -681,6 +681,8 @@ struct iwl_cfg iwl6000i_2bg_cfg = { 
	.fw_name_pre = IWL6050_FW_PRE,				\

	.ucode_api_max = IWL6050_UCODE_API_MAX,			\

	.ucode_api_min = IWL6050_UCODE_API_MIN,			\

	.valid_tx_ant = ANT_AB,		/* .cfg overwrite */	\

	.valid_rx_ant = ANT_AB,		/* .cfg overwrite */	\

	.ops = &iwl6050_ops,					\

	.eeprom_ver = EEPROM_6050_EEPROM_VERSION,		\

	.eeprom_calib_ver = EEPROM_6050_TX_POWER_VERSION,	\