rt2x00: Only free skb when beacon_update fails

In rt2x00lib_intf_scheduled_iter() we use the hw->beacon_update()
callback function. This means that it should behave similarly as mac80211
when that uses the function.

This means that the skb should only be freed when beacon_update() has failed,
otherwise the driver is the owner and is responsible for freeing the buffer.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index 0361524d193c913de1559d078c705d0c91aee681..f8fe7a139a8a540ef0f517ff85efe8aad494c999 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -433,11 +433,9 @@ static void rt2x00lib_intf_scheduled_iter(void *data, u8 *mac,
 
        if (delayed_flags & DELAYED_UPDATE_BEACON) {
                skb = ieee80211_beacon_get(rt2x00dev->hw, vif, &control);
-               if (skb) {
-                       rt2x00dev->ops->hw->beacon_update(rt2x00dev->hw, skb,
-                                                         &control);
+               if (skb && rt2x00dev->ops->hw->beacon_update(rt2x00dev->hw,
+                                                            skb, &control))
                        dev_kfree_skb(skb);
-               }
        }
 
        if (delayed_flags & DELAYED_CONFIG_ERP)