Commit 5a5f3b40 authored by Michael Buesch's avatar Michael Buesch Committed by John W. Linville
Browse files

b43: Remove QoS update workqueue 



We don't need the workqueue anymore, as we can now sleep in the callback.

Signed-off-by: default avatarMichael Buesch <mb@bu3sch.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b338994d

drivers/net/wireless/b43/b43.h

+1 −6
Original line number Diff line number Diff line
@@ -585,8 +585,6 @@ enum { 
struct b43_qos_params {

	/* The QOS parameters */

	struct ieee80211_tx_queue_params p;

	/* Does this need to get uploaded to hardware? */

	bool need_hw_update;

};



struct b43_wldev;
@@ -648,11 +646,8 @@ struct b43_wl { 
	bool beacon_templates_virgin; /* Never wrote the templates? */

	struct work_struct beacon_update_trigger;



	/* The current QOS parameters for the 4 queues.

	 * This is protected by the irq_lock. */

	/* The current QOS parameters for the 4 queues. */

	struct b43_qos_params qos_params[4];

	/* Workqueue for updating QOS parameters in hardware. */

	struct work_struct qos_update_work;



	/* Work for adjustment of the transmission power.

	 * This is scheduled when we determine that the actual TX output

drivers/net/wireless/b43/main.c

+23 −42
Original line number Diff line number Diff line
@@ -3068,30 +3068,22 @@ static const u16 b43_qos_shm_offsets[] = { 
	[3] = B43_QOS_BACKGROUND,

};



/* Update the QOS parameters in hardware. */

static void b43_qos_update(struct b43_wldev *dev)

/* Update all QOS parameters in hardware. */

static void b43_qos_upload_all(struct b43_wldev *dev)

{

	struct b43_wl *wl = dev->wl;

	struct b43_qos_params *params;

	unsigned long flags;

	unsigned int i;



	BUILD_BUG_ON(ARRAY_SIZE(b43_qos_shm_offsets) !=

		     ARRAY_SIZE(wl->qos_params));



	b43_mac_suspend(dev);

	spin_lock_irqsave(&wl->irq_lock, flags);



	for (i = 0; i < ARRAY_SIZE(wl->qos_params); i++) {

		params = &(wl->qos_params[i]);

		if (params->need_hw_update) {

		b43_qos_params_upload(dev, &(params->p),

				      b43_qos_shm_offsets[i]);

			params->need_hw_update = 0;

	}

	}



	spin_unlock_irqrestore(&wl->irq_lock, flags);

	b43_mac_enable(dev);

}
@@ -3136,20 +3128,14 @@ static void b43_qos_clear(struct b43_wl *wl) 
		default:

			B43_WARN_ON(1);

		}

		params->need_hw_update = 1;

	}

}



/* Initialize the core's QOS capabilities */

static void b43_qos_init(struct b43_wldev *dev)

{

	struct b43_wl *wl = dev->wl;

	unsigned int i;



	/* Upload the current QOS parameters. */

	for (i = 0; i < ARRAY_SIZE(wl->qos_params); i++)

		wl->qos_params[i].need_hw_update = 1;

	b43_qos_update(dev);

	b43_qos_upload_all(dev);



	/* Enable QOS support. */

	b43_hf_write(dev, b43_hf_read(dev) | B43_HF_EDCF);
@@ -3158,25 +3144,13 @@ static void b43_qos_init(struct b43_wldev *dev) 
		    | B43_MMIO_IFSCTL_USE_EDCF);

}



static void b43_qos_update_work(struct work_struct *work)

{

	struct b43_wl *wl = container_of(work, struct b43_wl, qos_update_work);

	struct b43_wldev *dev;



	mutex_lock(&wl->mutex);

	dev = wl->current_dev;

	if (likely(dev && (b43_status(dev) >= B43_STAT_INITIALIZED)))

		b43_qos_update(dev);

	mutex_unlock(&wl->mutex);

}



static int b43_op_conf_tx(struct ieee80211_hw *hw, u16 _queue,

			  const struct ieee80211_tx_queue_params *params)

{

	struct b43_wl *wl = hw_to_b43_wl(hw);

	unsigned long flags;

	struct b43_wldev *dev;

	unsigned int queue = (unsigned int)_queue;

	struct b43_qos_params *p;

	int err = -ENODEV;



	if (queue >= ARRAY_SIZE(wl->qos_params)) {

		/* Queue not available or don't support setting
@@ -3184,16 +3158,25 @@ static int b43_op_conf_tx(struct ieee80211_hw *hw, u16 _queue, 
		 * confuse mac80211. */

		return 0;

	}

	BUILD_BUG_ON(ARRAY_SIZE(b43_qos_shm_offsets) !=

		     ARRAY_SIZE(wl->qos_params));



	spin_lock_irqsave(&wl->irq_lock, flags);

	p = &(wl->qos_params[queue]);

	memcpy(&(p->p), params, sizeof(p->p));

	p->need_hw_update = 1;

	spin_unlock_irqrestore(&wl->irq_lock, flags);

	mutex_lock(&wl->mutex);

	dev = wl->current_dev;

	if (unlikely(!dev || (b43_status(dev) < B43_STAT_INITIALIZED)))

		goto out_unlock;



	queue_work(hw->workqueue, &wl->qos_update_work);

	memcpy(&(wl->qos_params[queue].p), params, sizeof(*params));

	b43_mac_suspend(dev);

	b43_qos_params_upload(dev, &(wl->qos_params[queue].p),

			      b43_qos_shm_offsets[queue]);

	b43_mac_enable(dev);

	err = 0;



	return 0;

out_unlock:

	mutex_unlock(&wl->mutex);



	return err;

}



static int b43_op_get_tx_stats(struct ieee80211_hw *hw,
@@ -4220,7 +4203,6 @@ static void b43_op_stop(struct ieee80211_hw *hw) 
	struct b43_wldev *dev = wl->current_dev;



	b43_rfkill_exit(dev);

	cancel_work_sync(&(wl->qos_update_work));

	cancel_work_sync(&(wl->beacon_update_trigger));



	mutex_lock(&wl->mutex);
@@ -4619,7 +4601,6 @@ static int b43_wireless_init(struct ssb_device *dev) 
	spin_lock_init(&wl->shm_lock);

	mutex_init(&wl->mutex);

	INIT_LIST_HEAD(&wl->devlist);

	INIT_WORK(&wl->qos_update_work, b43_qos_update_work);

	INIT_WORK(&wl->beacon_update_trigger, b43_beacon_update_trigger_work);

	INIT_WORK(&wl->txpower_adjust_work, b43_phy_txpower_adjust_work);