Commit 283dafa1 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by John W. Linville
Browse files

rt2x00: change beaconing locking 



This patch is needed for further changes to keep global variables
consistent when changing beaconing on diffrent vif's.

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 7d8831bb

drivers/net/wireless/rt2x00/rt2x00dev.c

+5 −2
Original line number Diff line number Diff line
@@ -141,8 +141,11 @@ static void rt2x00lib_intf_scheduled_iter(void *data, u8 *mac, 
	if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))

		return;



	if (test_and_clear_bit(DELAYED_UPDATE_BEACON, &intf->delayed_flags))

	if (test_and_clear_bit(DELAYED_UPDATE_BEACON, &intf->delayed_flags)) {

		mutex_lock(&intf->beacon_skb_mutex);

		rt2x00queue_update_beacon(rt2x00dev, vif);

		mutex_unlock(&intf->beacon_skb_mutex);

	}

}



static void rt2x00lib_intf_scheduled(struct work_struct *work)
@@ -216,7 +219,7 @@ static void rt2x00lib_beaconupdate_iter(void *data, u8 *mac, 
	 * never be called for USB devices.

	 */

	WARN_ON(rt2x00_is_usb(rt2x00dev));

	rt2x00queue_update_beacon_locked(rt2x00dev, vif);

	rt2x00queue_update_beacon(rt2x00dev, vif);

}



void rt2x00lib_beacondone(struct rt2x00_dev *rt2x00dev)

drivers/net/wireless/rt2x00/rt2x00mac.c

+2 −4
Original line number Diff line number Diff line
@@ -624,6 +624,7 @@ void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw, 
	 * Start/stop beaconing.

	 */

	if (changes & BSS_CHANGED_BEACON_ENABLED) {

		mutex_lock(&intf->beacon_skb_mutex);

		if (!bss_conf->enable_beacon && intf->enable_beacon) {

			rt2x00dev->intf_beaconing--;

			intf->enable_beacon = false;
@@ -639,9 +640,7 @@ void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw, 
				 * Last beaconing interface disabled

				 * -> stop beacon queue.

				 */

				mutex_lock(&intf->beacon_skb_mutex);

				rt2x00queue_stop_queue(rt2x00dev->bcn);

				mutex_unlock(&intf->beacon_skb_mutex);

			}

		} else if (bss_conf->enable_beacon && !intf->enable_beacon) {

			rt2x00dev->intf_beaconing++;
@@ -658,11 +657,10 @@ void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw, 
				 * First beaconing interface enabled

				 * -> start beacon queue.

				 */

				mutex_lock(&intf->beacon_skb_mutex);

				rt2x00queue_start_queue(rt2x00dev->bcn);

				mutex_unlock(&intf->beacon_skb_mutex);

			}

		}

		mutex_unlock(&intf->beacon_skb_mutex);

	}



	/*

drivers/net/wireless/rt2x00/rt2x00queue.c

+2 −19
Original line number Diff line number Diff line
@@ -754,8 +754,6 @@ int rt2x00queue_clear_beacon(struct rt2x00_dev *rt2x00dev, 
	if (unlikely(!intf->beacon))

		return -ENOBUFS;



	mutex_lock(&intf->beacon_skb_mutex);



	/*

	 * Clean up the beacon skb.

	 */
@@ -768,12 +766,10 @@ int rt2x00queue_clear_beacon(struct rt2x00_dev *rt2x00dev, 
	if (rt2x00dev->ops->lib->clear_beacon)

		rt2x00dev->ops->lib->clear_beacon(intf->beacon);



	mutex_unlock(&intf->beacon_skb_mutex);



	return 0;

}



int rt2x00queue_update_beacon_locked(struct rt2x00_dev *rt2x00dev,

int rt2x00queue_update_beacon(struct rt2x00_dev *rt2x00dev,

			      struct ieee80211_vif *vif)

{

	struct rt2x00_intf *intf = vif_to_intf(vif);
@@ -815,19 +811,6 @@ int rt2x00queue_update_beacon_locked(struct rt2x00_dev *rt2x00dev, 


}



int rt2x00queue_update_beacon(struct rt2x00_dev *rt2x00dev,

			      struct ieee80211_vif *vif)

{

	struct rt2x00_intf *intf = vif_to_intf(vif);

	int ret;



	mutex_lock(&intf->beacon_skb_mutex);

	ret = rt2x00queue_update_beacon_locked(rt2x00dev, vif);

	mutex_unlock(&intf->beacon_skb_mutex);



	return ret;

}



bool rt2x00queue_for_each_entry(struct data_queue *queue,

				enum queue_index start,

				enum queue_index end,

CRA Git | Maintained and supported by SUSTech CRA and CCSE