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

Commit afa62042 authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville
Browse files

rt2x00: configure_filter() callback is allowed to sleep 



The configure_filter() callback function no longer needs
to be atomic. Remove the scheduled work structure and
call into the driver configure_filter() directly.

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ad002395

drivers/net/wireless/rt2x00/rt2x00.h

+0 −1
Original line number Diff line number Diff line
@@ -826,7 +826,6 @@ struct rt2x00_dev { 
	 * due to RTNL locking requirements.

	 */

	struct work_struct intf_work;

	struct work_struct filter_work;



	/*

	 * Data queue arrays for RX, TX and Beacon.

drivers/net/wireless/rt2x00/rt2x00dev.c

+0 −10
Original line number Diff line number Diff line
@@ -118,14 +118,6 @@ void rt2x00lib_toggle_rx(struct rt2x00_dev *rt2x00dev, enum dev_state state) 
		rt2x00link_start_tuner(rt2x00dev);

}



static void rt2x00lib_packetfilter_scheduled(struct work_struct *work)

{

	struct rt2x00_dev *rt2x00dev =

	    container_of(work, struct rt2x00_dev, filter_work);



	rt2x00dev->ops->lib->config_filter(rt2x00dev, rt2x00dev->packet_filter);

}



static void rt2x00lib_intf_scheduled_iter(void *data, u8 *mac,

					  struct ieee80211_vif *vif)

{
@@ -859,7 +851,6 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev) 
	 * Initialize configuration work.

	 */

	INIT_WORK(&rt2x00dev->intf_work, rt2x00lib_intf_scheduled);

	INIT_WORK(&rt2x00dev->filter_work, rt2x00lib_packetfilter_scheduled);



	/*

	 * Allocate queue array.
@@ -907,7 +898,6 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev) 
	/*

	 * Stop all work.

	 */

	cancel_work_sync(&rt2x00dev->filter_work);

	cancel_work_sync(&rt2x00dev->intf_work);



	/*

drivers/net/wireless/rt2x00/rt2x00mac.c

+1 −4
Original line number Diff line number Diff line
@@ -430,10 +430,7 @@ void rt2x00mac_configure_filter(struct ieee80211_hw *hw, 
		return;

	rt2x00dev->packet_filter = *total_flags;



	if (!test_bit(DRIVER_REQUIRE_SCHEDULED, &rt2x00dev->flags))

	rt2x00dev->ops->lib->config_filter(rt2x00dev, *total_flags);

	else

		ieee80211_queue_work(rt2x00dev->hw, &rt2x00dev->filter_work);

}

EXPORT_SYMBOL_GPL(rt2x00mac_configure_filter);