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

Commit 3830de73 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 2a6f4e49 6ef89d0a

drivers/net/wireless/b43/main.c

+1 −1
Original line number Diff line number Diff line
@@ -2391,7 +2391,7 @@ static void b43_periodic_work_handler(struct work_struct *work) 
	if (b43_debug(dev, B43_DBG_PWORK_FAST))

		delay = msecs_to_jiffies(50);

	else

		delay = round_jiffies(HZ * 15);

		delay = round_jiffies_relative(HZ * 15);

	queue_delayed_work(wl->hw->workqueue, &dev->periodic_work, delay);

out:

	mutex_unlock(&wl->mutex);

drivers/net/wireless/b43legacy/main.c

+1 −1
Original line number Diff line number Diff line
@@ -2260,7 +2260,7 @@ static void b43legacy_periodic_work_handler(struct work_struct *work) 
	if (b43legacy_debug(dev, B43legacy_DBG_PWORK_FAST))

		delay = msecs_to_jiffies(50);

	else

		delay = round_jiffies(HZ);

		delay = round_jiffies_relative(HZ);

	queue_delayed_work(dev->wl->hw->workqueue,

			   &dev->periodic_work, delay);

out:

drivers/net/wireless/ipw2100.c

+6 −5
Original line number Diff line number Diff line
@@ -1769,7 +1769,7 @@ static int ipw2100_up(struct ipw2100_priv *priv, int deferred) 
		if (priv->stop_rf_kill) {

			priv->stop_rf_kill = 0;

			queue_delayed_work(priv->workqueue, &priv->rf_kill,

					   round_jiffies(HZ));

					   round_jiffies_relative(HZ));

		}



		deferred = 1;
@@ -2086,7 +2086,8 @@ static void isr_indicate_rf_kill(struct ipw2100_priv *priv, u32 status) 
	/* Make sure the RF Kill check timer is running */

	priv->stop_rf_kill = 0;

	cancel_delayed_work(&priv->rf_kill);

	queue_delayed_work(priv->workqueue, &priv->rf_kill, round_jiffies(HZ));

	queue_delayed_work(priv->workqueue, &priv->rf_kill,

			   round_jiffies_relative(HZ));

}



static void send_scan_event(void *data)
@@ -2123,7 +2124,7 @@ static void isr_scan_complete(struct ipw2100_priv *priv, u32 status) 
		if (!delayed_work_pending(&priv->scan_event_later))

			queue_delayed_work(priv->workqueue,

					&priv->scan_event_later,

					round_jiffies(msecs_to_jiffies(4000)));

					round_jiffies_relative(msecs_to_jiffies(4000)));

	} else {

		priv->user_requested_scan = 0;

		cancel_delayed_work(&priv->scan_event_later);
@@ -4242,7 +4243,7 @@ static int ipw_radio_kill_sw(struct ipw2100_priv *priv, int disable_radio) 
			priv->stop_rf_kill = 0;

			cancel_delayed_work(&priv->rf_kill);

			queue_delayed_work(priv->workqueue, &priv->rf_kill,

					   round_jiffies(HZ));

					   round_jiffies_relative(HZ));

		} else

			schedule_reset(priv);

	}
@@ -5981,7 +5982,7 @@ static void ipw2100_rf_kill(struct work_struct *work) 
		IPW_DEBUG_RF_KILL("RF Kill active, rescheduling GPIO check\n");

		if (!priv->stop_rf_kill)

			queue_delayed_work(priv->workqueue, &priv->rf_kill,

					   round_jiffies(HZ));

					   round_jiffies_relative(HZ));

		goto exit_unlock;

	}

drivers/net/wireless/ipw2200.c

+3 −3
Original line number Diff line number Diff line
@@ -1753,7 +1753,7 @@ static int ipw_radio_kill_sw(struct ipw_priv *priv, int disable_radio) 
			/* Make sure the RF_KILL check timer is running */

			cancel_delayed_work(&priv->rf_kill);

			queue_delayed_work(priv->workqueue, &priv->rf_kill,

					   round_jiffies(2 * HZ));

					   round_jiffies_relative(2 * HZ));

		} else

			queue_work(priv->workqueue, &priv->up);

	}
@@ -4364,7 +4364,7 @@ static void handle_scan_event(struct ipw_priv *priv) 
	if (!priv->user_requested_scan) {

		if (!delayed_work_pending(&priv->scan_event))

			queue_delayed_work(priv->workqueue, &priv->scan_event,

					 round_jiffies(msecs_to_jiffies(4000)));

					 round_jiffies_relative(msecs_to_jiffies(4000)));

	} else {

		union iwreq_data wrqu;
@@ -4728,7 +4728,7 @@ static void ipw_rx_notification(struct ipw_priv *priv, 
				 && priv->status & STATUS_ASSOCIATED)

				queue_delayed_work(priv->workqueue,

						   &priv->request_scan,

						   round_jiffies(HZ));

						   round_jiffies_relative(HZ));



			/* Send an empty event to user space.

			 * We don't send the received data on the event because

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

+2 −4
Original line number Diff line number Diff line
@@ -3232,9 +3232,7 @@ int iwl4965_tx_cmd(struct iwl_priv *priv, struct iwl_cmd *out_cmd, 
	tx->rate_n_flags = iwl_hw_set_rate_n_flags(iwl_rates[rate_index].plcp,

						rate_flags);



	if (ieee80211_is_probe_request(fc))

		tx->tx_flags |= TX_CMD_FLG_TSF_MSK;

	else if (ieee80211_is_back_request(fc))

	if (ieee80211_is_back_request(fc))

		tx->tx_flags |= TX_CMD_FLG_ACK_MSK |

			TX_CMD_FLG_IMM_BA_RSP_MASK;

#ifdef CONFIG_IWLWIFI_HT
@@ -3872,7 +3870,7 @@ static void iwl4965_rx_reply_rx(struct iwl_priv *priv, 
			 */

		case IEEE80211_STYPE_ASSOC_RESP:

		case IEEE80211_STYPE_REASSOC_RESP:

			if (network_packet && iwl_is_associated(priv)) {

			if (network_packet) {

#ifdef CONFIG_IWLWIFI_HT

				u8 *pos = NULL;

				struct ieee802_11_elems elems;