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

Commit 85b161a8 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'fixes-jgarzik' of... 

Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes
parents c99da91e 3ae6a054

drivers/net/wireless/b43/main.c

+1 −1
Original line number Diff line number Diff line
@@ -1566,7 +1566,7 @@ static void b43_release_firmware(struct b43_wldev *dev) 
static void b43_print_fw_helptext(struct b43_wl *wl)

{

	b43err(wl, "You must go to "

	       "http://linuxwireless.org/en/users/Drivers/bcm43xx#devicefirmware "

	       "http://linuxwireless.org/en/users/Drivers/b43#devicefirmware "

	       "and download the correct firmware (version 4).\n");

}

drivers/net/wireless/b43legacy/dma.c

+1 −1
Original line number Diff line number Diff line
@@ -996,7 +996,7 @@ int b43legacy_dma_init(struct b43legacy_wldev *dev) 


	err = ssb_dma_set_mask(dev->dev, dmamask);

	if (err) {

#ifdef BCM43XX_PIO

#ifdef CONFIG_B43LEGACY_PIO

		b43legacywarn(dev->wl, "DMA for this device not supported. "

			"Falling back to PIO\n");

		dev->__using_pio = 1;

drivers/net/wireless/b43legacy/main.c

+1 −1
Original line number Diff line number Diff line
@@ -1419,7 +1419,7 @@ static void b43legacy_release_firmware(struct b43legacy_wldev *dev) 
static void b43legacy_print_fw_helptext(struct b43legacy_wl *wl)

{

	b43legacyerr(wl, "You must go to http://linuxwireless.org/en/users/"

		     "Drivers/bcm43xx#devicefirmware "

		     "Drivers/b43#devicefirmware "

		     "and download the correct firmware (version 3).\n");

}

drivers/net/wireless/iwlwifi/iwl3945-base.c

+12 −4
Original line number Diff line number Diff line
@@ -2915,6 +2915,10 @@ static void iwl_set_rate(struct iwl_priv *priv) 
	int i;



	hw = iwl_get_hw_mode(priv, priv->phymode);

	if (!hw) {

		IWL_ERROR("Failed to set rate: unable to get hw mode\n");

		return;

	}



	priv->active_rate = 0;

	priv->active_rate_basic = 0;
@@ -6936,13 +6940,10 @@ static int iwl_mac_add_interface(struct ieee80211_hw *hw, 
	DECLARE_MAC_BUF(mac);



	IWL_DEBUG_MAC80211("enter: id %d, type %d\n", conf->if_id, conf->type);

	if (conf->mac_addr)

		IWL_DEBUG_MAC80211("enter: MAC %s\n",

				   print_mac(mac, conf->mac_addr));



	if (priv->interface_id) {

		IWL_DEBUG_MAC80211("leave - interface_id != 0\n");

		return 0;

		return -EOPNOTSUPP;

	}



	spin_lock_irqsave(&priv->lock, flags);
@@ -6951,6 +6952,12 @@ static int iwl_mac_add_interface(struct ieee80211_hw *hw, 
	spin_unlock_irqrestore(&priv->lock, flags);



	mutex_lock(&priv->mutex);



	if (conf->mac_addr) {

		IWL_DEBUG_MAC80211("Set: %s\n", print_mac(mac, conf->mac_addr));

		memcpy(priv->mac_addr, conf->mac_addr, ETH_ALEN);

	}



	iwl_set_mode(priv, conf->type);



	IWL_DEBUG_MAC80211("leave\n");
@@ -8270,6 +8277,7 @@ static void iwl_cancel_deferred_work(struct iwl_priv *priv) 
{

	iwl_hw_cancel_deferred_work(priv);



	cancel_delayed_work_sync(&priv->init_alive_start);

	cancel_delayed_work(&priv->scan_check);

	cancel_delayed_work(&priv->alive_start);

	cancel_delayed_work(&priv->post_associate);

drivers/net/wireless/iwlwifi/iwl4965-base.c

+10 −3
Original line number Diff line number Diff line
@@ -3003,6 +3003,10 @@ static void iwl_set_rate(struct iwl_priv *priv) 
	int i;



	hw = iwl_get_hw_mode(priv, priv->phymode);

	if (!hw) {

		IWL_ERROR("Failed to set rate: unable to get hw mode\n");

		return;

	}



	priv->active_rate = 0;

	priv->active_rate_basic = 0;
@@ -7326,9 +7330,6 @@ static int iwl_mac_add_interface(struct ieee80211_hw *hw, 
	DECLARE_MAC_BUF(mac);



	IWL_DEBUG_MAC80211("enter: id %d, type %d\n", conf->if_id, conf->type);

	if (conf->mac_addr)

		IWL_DEBUG_MAC80211("enter: MAC %s\n",

				   print_mac(mac, conf->mac_addr));



	if (priv->interface_id) {

		IWL_DEBUG_MAC80211("leave - interface_id != 0\n");
@@ -7341,6 +7342,11 @@ static int iwl_mac_add_interface(struct ieee80211_hw *hw, 
	spin_unlock_irqrestore(&priv->lock, flags);



	mutex_lock(&priv->mutex);



	if (conf->mac_addr) {

		IWL_DEBUG_MAC80211("Set %s\n", print_mac(mac, conf->mac_addr));

		memcpy(priv->mac_addr, conf->mac_addr, ETH_ALEN);

	}

	iwl_set_mode(priv, conf->type);



	IWL_DEBUG_MAC80211("leave\n");
@@ -8864,6 +8870,7 @@ static void iwl_cancel_deferred_work(struct iwl_priv *priv) 
{

	iwl_hw_cancel_deferred_work(priv);



	cancel_delayed_work_sync(&priv->init_alive_start);

	cancel_delayed_work(&priv->scan_check);

	cancel_delayed_work(&priv->alive_start);

	cancel_delayed_work(&priv->post_associate);