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: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Ivo van Doorn 2008-10-29 17:18:22 +01:00 committed by John W. Linville
parent e4ea1c403a
commit c3fd7b41ca
3 changed files with 1 additions and 9 deletions

View File

@ -347,13 +347,6 @@ struct rt2x00_intf {
*/ */
spinlock_t lock; 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. * MAC of the device.
*/ */

View File

@ -417,7 +417,7 @@ static void rt2x00lib_intf_scheduled_iter(void *data, u8 *mac,
*/ */
spin_lock(&intf->lock); spin_lock(&intf->lock);
memcpy(&conf, &intf->conf, sizeof(conf)); memcpy(&conf, &vif->bss_conf, sizeof(conf));
delayed_flags = intf->delayed_flags; delayed_flags = intf->delayed_flags;
intf->delayed_flags = 0; intf->delayed_flags = 0;

View File

@ -634,7 +634,6 @@ void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw,
} }
spin_lock(&intf->lock); spin_lock(&intf->lock);
memcpy(&intf->conf, bss_conf, sizeof(*bss_conf));
if (delayed) { if (delayed) {
intf->delayed_flags |= delayed; intf->delayed_flags |= delayed;
schedule_work(&rt2x00dev->intf_work); schedule_work(&rt2x00dev->intf_work);