diff options
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00dev.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00dev.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c index b48c04e80a38..8c93eb8353b0 100644 --- a/drivers/net/wireless/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c | |||
@@ -409,7 +409,6 @@ static void rt2x00lib_intf_scheduled_iter(void *data, u8 *mac, | |||
409 | { | 409 | { |
410 | struct rt2x00_dev *rt2x00dev = data; | 410 | struct rt2x00_dev *rt2x00dev = data; |
411 | struct rt2x00_intf *intf = vif_to_intf(vif); | 411 | struct rt2x00_intf *intf = vif_to_intf(vif); |
412 | struct sk_buff *skb; | ||
413 | struct ieee80211_bss_conf conf; | 412 | struct ieee80211_bss_conf conf; |
414 | int delayed_flags; | 413 | int delayed_flags; |
415 | 414 | ||
@@ -435,12 +434,8 @@ static void rt2x00lib_intf_scheduled_iter(void *data, u8 *mac, | |||
435 | if (!test_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags)) | 434 | if (!test_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags)) |
436 | return; | 435 | return; |
437 | 436 | ||
438 | if (delayed_flags & DELAYED_UPDATE_BEACON) { | 437 | if (delayed_flags & DELAYED_UPDATE_BEACON) |
439 | skb = ieee80211_beacon_get(rt2x00dev->hw, vif); | 438 | rt2x00queue_update_beacon(rt2x00dev, vif); |
440 | if (skb && | ||
441 | rt2x00dev->ops->hw->beacon_update(rt2x00dev->hw, skb)) | ||
442 | dev_kfree_skb(skb); | ||
443 | } | ||
444 | 439 | ||
445 | if (delayed_flags & DELAYED_CONFIG_ERP) | 440 | if (delayed_flags & DELAYED_CONFIG_ERP) |
446 | rt2x00lib_config_erp(rt2x00dev, intf, &conf); | 441 | rt2x00lib_config_erp(rt2x00dev, intf, &conf); |