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

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

rt2x00: Remove ieee80211_bss_conf from rt2x00_intf 



We can safely remove ieee80211_bss_conf from rt2x00_intf,
it is provided by mac80211 in ieee80211_vif as well.
(rt2x00_intf is the drv_priv field of ieee80211_vif).

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

drivers/net/wireless/rt2x00/rt2x00.h

+0 −7
Original line number Diff line number Diff line
@@ -347,13 +347,6 @@ struct rt2x00_intf { 
	 */

	spinlock_t lock;



	/*

	 * BSS configuration. Copied from the structure

	 * passed to us through the bss_info_changed()

	 * callback funtion.

	 */

	struct ieee80211_bss_conf conf;



	/*

	 * MAC of the device.

	 */

drivers/net/wireless/rt2x00/rt2x00dev.c

+1 −1
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ static void rt2x00lib_intf_scheduled_iter(void *data, u8 *mac, 
	 */

	spin_lock(&intf->lock);



	memcpy(&conf, &intf->conf, sizeof(conf));

	memcpy(&conf, &vif->bss_conf, sizeof(conf));

	delayed_flags = intf->delayed_flags;

	intf->delayed_flags = 0;

drivers/net/wireless/rt2x00/rt2x00mac.c

+0 −1
Original line number Diff line number Diff line
@@ -634,7 +634,6 @@ void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw, 
	}



	spin_lock(&intf->lock);

	memcpy(&intf->conf, bss_conf, sizeof(*bss_conf));

	if (delayed) {

		intf->delayed_flags |= delayed;

		schedule_work(&rt2x00dev->intf_work);