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

Commit ed3f2e40 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-next-2.6

parents fb699dfd bd6b4442

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -1086,7 +1086,6 @@ F: include/net/ax25.h 
F:	net/ax25/



B43 WIRELESS DRIVER

M:	Michael Buesch <mb@bu3sch.de>

M:	Stefano Brivio <stefano.brivio@polimi.it>

L:	linux-wireless@vger.kernel.org

W:	http://linuxwireless.org/en/users/Drivers/b43

drivers/net/wireless/airo.c

+2 −1
Original line number Diff line number Diff line
@@ -5660,7 +5660,8 @@ static int airo_pci_suspend(struct pci_dev *pdev, pm_message_t state) 


	pci_enable_wake(pdev, pci_choose_state(pdev, state), 1);

	pci_save_state(pdev);

	return pci_set_power_state(pdev, pci_choose_state(pdev, state));

	pci_set_power_state(pdev, pci_choose_state(pdev, state));

	return 0;

}



static int airo_pci_resume(struct pci_dev *pdev)

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

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ struct ar9170 { 
	struct sk_buff_head tx_status_ampdu;

	spinlock_t tx_ampdu_list_lock;

	struct list_head tx_ampdu_list;

	unsigned int tx_ampdu_pending;

	atomic_t tx_ampdu_pending;



	/* rxstream mpdu merge */

	struct ar9170_rxstream_mpdu_merge rx_mpdu;

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

+2 −2
Original line number Diff line number Diff line
@@ -152,14 +152,14 @@ enum ar9170_cmd { 
#define		AR9170_MAC_REG_FTF_BIT14		BIT(14)

#define		AR9170_MAC_REG_FTF_BIT15		BIT(15)

#define		AR9170_MAC_REG_FTF_BAR			BIT(24)

#define		AR9170_MAC_REG_FTF_BIT25		BIT(25)

#define		AR9170_MAC_REG_FTF_BA			BIT(25)

#define		AR9170_MAC_REG_FTF_PSPOLL		BIT(26)

#define		AR9170_MAC_REG_FTF_RTS			BIT(27)

#define		AR9170_MAC_REG_FTF_CTS			BIT(28)

#define		AR9170_MAC_REG_FTF_ACK			BIT(29)

#define		AR9170_MAC_REG_FTF_CFE			BIT(30)

#define		AR9170_MAC_REG_FTF_CFE_ACK		BIT(31)

#define		AR9170_MAC_REG_FTF_DEFAULTS		0x0500ffff

#define		AR9170_MAC_REG_FTF_DEFAULTS		0x0700ffff

#define		AR9170_MAC_REG_FTF_MONITOR		0xfd00ffff



#define AR9170_MAC_REG_RX_TOTAL			(AR9170_MAC_REG_BASE + 0x6A0)

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

+6 −5
Original line number Diff line number Diff line
@@ -414,9 +414,9 @@ static void ar9170_tx_ampdu_callback(struct ar9170 *ar, struct sk_buff *skb) 


	skb_queue_tail(&ar->tx_status_ampdu, skb);

	ar9170_tx_fake_ampdu_status(ar);

	ar->tx_ampdu_pending--;



	if (!list_empty(&ar->tx_ampdu_list) && !ar->tx_ampdu_pending)

	if (atomic_dec_and_test(&ar->tx_ampdu_pending) &&

	    !list_empty(&ar->tx_ampdu_list))

		ar9170_tx_ampdu(ar);

}
@@ -1248,6 +1248,7 @@ static int ar9170_op_start(struct ieee80211_hw *hw) 
	ar->global_ampdu_density = 6;

	ar->global_ampdu_factor = 3;



	atomic_set(&ar->tx_ampdu_pending, 0);

	ar->bad_hw_nagger = jiffies;



	err = ar->open(ar);
@@ -1773,7 +1774,7 @@ static void ar9170_tx(struct ar9170 *ar) 
					  msecs_to_jiffies(AR9170_TX_TIMEOUT);



			if (arinfo->flags == AR9170_TX_FLAG_BLOCK_ACK)

				ar->tx_ampdu_pending++;

				atomic_inc(&ar->tx_ampdu_pending);



#ifdef AR9170_QUEUE_DEBUG

			printk(KERN_DEBUG "%s: send frame q:%d =>\n",
@@ -1784,7 +1785,7 @@ static void ar9170_tx(struct ar9170 *ar) 
			err = ar->tx(ar, skb);

			if (unlikely(err)) {

				if (arinfo->flags == AR9170_TX_FLAG_BLOCK_ACK)

					ar->tx_ampdu_pending--;

					atomic_dec(&ar->tx_ampdu_pending);



				frames_failed++;

				dev_kfree_skb_any(skb);
@@ -1931,7 +1932,7 @@ int ar9170_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb) 
	if (info->flags & IEEE80211_TX_CTL_AMPDU) {

		bool run = ar9170_tx_ampdu_queue(ar, skb);



		if (run || !ar->tx_ampdu_pending)

		if (run || !atomic_read(&ar->tx_ampdu_pending))

			ar9170_tx_ampdu(ar);

	} else {

		unsigned int queue = skb_get_queue_mapping(skb);