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

Commit d2daeabf 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 c3b85423 1ce822fa

Documentation/DocBook/mac80211.tmpl

+0 −2
Original line number Original line Diff line number Diff line
@@ -184,8 +184,6 @@ usage should require reading the full document. 
!Finclude/net/mac80211.h ieee80211_ctstoself_get

!Finclude/net/mac80211.h ieee80211_ctstoself_get

!Finclude/net/mac80211.h ieee80211_ctstoself_duration

!Finclude/net/mac80211.h ieee80211_ctstoself_duration

!Finclude/net/mac80211.h ieee80211_generic_frame_duration

!Finclude/net/mac80211.h ieee80211_generic_frame_duration

!Finclude/net/mac80211.h ieee80211_get_hdrlen_from_skb

!Finclude/net/mac80211.h ieee80211_hdrlen

!Finclude/net/mac80211.h ieee80211_wake_queue

!Finclude/net/mac80211.h ieee80211_wake_queue

!Finclude/net/mac80211.h ieee80211_stop_queue

!Finclude/net/mac80211.h ieee80211_stop_queue

!Finclude/net/mac80211.h ieee80211_wake_queues

!Finclude/net/mac80211.h ieee80211_wake_queues

drivers/net/wireless/ath/Kconfig

+1 −0
Original line number Original line Diff line number Diff line 
config ATH_COMMON

config ATH_COMMON

	tristate "Atheros Wireless Cards"

	tristate "Atheros Wireless Cards"

	depends on WLAN_80211

	depends on ATH5K || ATH9K || AR9170_USB

	depends on ATH5K || ATH9K || AR9170_USB





source "drivers/net/wireless/ath/ath5k/Kconfig"

source "drivers/net/wireless/ath/ath5k/Kconfig"

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

+8 −1
Original line number Original line Diff line number Diff line
@@ -355,6 +355,13 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq, 
		}

		}





		if (bf_next == NULL) {

		if (bf_next == NULL) {

			/*

			 * Make sure the last desc is reclaimed if it

			 * not a holding desc.

			 */

			if (!bf_last->bf_stale)

				list_move_tail(&bf->list, &bf_head);

			else

				INIT_LIST_HEAD(&bf_head);

				INIT_LIST_HEAD(&bf_head);

		} else {

		} else {

			ASSERT(!list_empty(bf_q));

			ASSERT(!list_empty(bf_q));

drivers/net/wireless/b43/b43.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -648,6 +648,7 @@ struct b43_wl { 
	u8 nr_devs;

	u8 nr_devs;





	bool radiotap_enabled;

	bool radiotap_enabled;

	bool radio_enabled;





	/* The beacon we are currently using (AP or IBSS mode).

	/* The beacon we are currently using (AP or IBSS mode).

	 * This beacon stuff is protected by the irq_lock. */

	 * This beacon stuff is protected by the irq_lock. */

drivers/net/wireless/b43/main.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -3497,8 +3497,8 @@ static int b43_op_config(struct ieee80211_hw *hw, u32 changed) 
	if (phy->ops->set_rx_antenna)

	if (phy->ops->set_rx_antenna)

		phy->ops->set_rx_antenna(dev, antenna);

		phy->ops->set_rx_antenna(dev, antenna);





	if (!!conf->radio_enabled != phy->radio_on) {

	if (wl->radio_enabled != phy->radio_on) {

		if (conf->radio_enabled) {

		if (wl->radio_enabled) {

			b43_software_rfkill(dev, false);

			b43_software_rfkill(dev, false);

			b43info(dev->wl, "Radio turned on by software\n");

			b43info(dev->wl, "Radio turned on by software\n");

			if (!dev->radio_hw_enable) {

			if (!dev->radio_hw_enable) {
@@ -4339,6 +4339,7 @@ static int b43_op_start(struct ieee80211_hw *hw) 
	wl->beacon0_uploaded = 0;

	wl->beacon0_uploaded = 0;

	wl->beacon1_uploaded = 0;

	wl->beacon1_uploaded = 0;

	wl->beacon_templates_virgin = 1;

	wl->beacon_templates_virgin = 1;

	wl->radio_enabled = 1;





	mutex_lock(&wl->mutex);

	mutex_lock(&wl->mutex);
@@ -4378,6 +4379,7 @@ static void b43_op_stop(struct ieee80211_hw *hw) 
	if (b43_status(dev) >= B43_STAT_STARTED)

	if (b43_status(dev) >= B43_STAT_STARTED)

		b43_wireless_core_stop(dev);

		b43_wireless_core_stop(dev);

	b43_wireless_core_exit(dev);

	b43_wireless_core_exit(dev);

	wl->radio_enabled = 0;

	mutex_unlock(&wl->mutex);

	mutex_unlock(&wl->mutex);





	cancel_work_sync(&(wl->txpower_adjust_work));

	cancel_work_sync(&(wl->txpower_adjust_work));
@@ -4560,6 +4562,7 @@ static int b43_wireless_core_attach(struct b43_wldev *dev) 
		B43_WARN_ON(1);

		B43_WARN_ON(1);





	dev->phy.gmode = have_2ghz_phy;

	dev->phy.gmode = have_2ghz_phy;

	dev->phy.radio_on = 1;

	tmp = dev->phy.gmode ? B43_TMSLOW_GMODE : 0;

	tmp = dev->phy.gmode ? B43_TMSLOW_GMODE : 0;

	b43_wireless_core_reset(dev, tmp);

	b43_wireless_core_reset(dev, tmp);