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

Commit bfe6a15d authored by Helmut Schaa's avatar Helmut Schaa Committed by John W. Linville
Browse files

rt2x00: Simplify intf->delayed_flags locking 



Instead of protecting delayed_flags with a spinlock use atomic bitops to
make the code more readable.

Signed-off-by: default avatarHelmut Schaa <helmut.schaa@googlemail.com>
Acked-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f833eea0

drivers/net/wireless/rt2x00/rt2x00.h

+5 −2
Original line number Diff line number Diff line
@@ -347,6 +347,10 @@ struct link { 
	struct delayed_work watchdog_work;

};



enum rt2x00_delayed_flags {

	DELAYED_UPDATE_BEACON,

};



/*

 * Interface structure

 * Per interface configuration details, this structure
@@ -374,8 +378,7 @@ struct rt2x00_intf { 
	/*

	 * Actions that needed rescheduling.

	 */

	unsigned int delayed_flags;

#define DELAYED_UPDATE_BEACON		0x00000001

	unsigned long delayed_flags;



	/*

	 * Software sequence counter, this is only required

drivers/net/wireless/rt2x00/rt2x00dev.c

+1 −14
Original line number Diff line number Diff line
@@ -110,19 +110,6 @@ static void rt2x00lib_intf_scheduled_iter(void *data, u8 *mac, 
{

	struct rt2x00_dev *rt2x00dev = data;

	struct rt2x00_intf *intf = vif_to_intf(vif);

	int delayed_flags;



	/*

	 * Copy all data we need during this action under the protection

	 * of a spinlock. Otherwise race conditions might occur which results

	 * into an invalid configuration.

	 */

	spin_lock(&intf->lock);



	delayed_flags = intf->delayed_flags;

	intf->delayed_flags = 0;



	spin_unlock(&intf->lock);



	/*

	 * It is possible the radio was disabled while the work had been
@@ -133,7 +120,7 @@ static void rt2x00lib_intf_scheduled_iter(void *data, u8 *mac, 
	if (!test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))

		return;



	if (delayed_flags & DELAYED_UPDATE_BEACON)

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

		rt2x00queue_update_beacon(rt2x00dev, vif, true);

}

drivers/net/wireless/rt2x00/rt2x00mac.c

+1 −3
Original line number Diff line number Diff line
@@ -444,9 +444,7 @@ static void rt2x00mac_set_tim_iter(void *data, u8 *mac, 
	    vif->type != NL80211_IFTYPE_WDS)

		return;



	spin_lock(&intf->lock);

	intf->delayed_flags |= DELAYED_UPDATE_BEACON;

	spin_unlock(&intf->lock);

	set_bit(DELAYED_UPDATE_BEACON, &intf->delayed_flags);

}



int rt2x00mac_set_tim(struct ieee80211_hw *hw, struct ieee80211_sta *sta,