Commit 171afcd4 authored Apr 09, 2008 by Ivo van Doorn Committed by John W. Linville Apr 16, 2008

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>

parent 3a245766

drivers/net/wireless/rt2x00/rt2x00dev.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -433,12 +433,10 @@ 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)
		rt2x00lib_config_erp(rt2x00dev, intf, &intf->conf);