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

Commit a4727801 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

zd1211rw: honour enable_beacon conf 



This makes zd1211rw honour enable_beacon, as well as fixing
a memory leak: the beacon skb is leaked when configuring it
to the hardware fails.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5e133362

drivers/net/wireless/zd1211rw/zd_mac.c

+13 −3
Original line number Diff line number Diff line
@@ -768,13 +768,23 @@ static int zd_op_config_interface(struct ieee80211_hw *hw, 
			if (!beacon)

				return -ENOMEM;

			r = zd_mac_config_beacon(hw, beacon);

			kfree_skb(beacon);



			if (r < 0)

				return r;

			r = zd_set_beacon_interval(&mac->chip, BCN_MODE_IBSS |

					hw->conf.beacon_int);

		}



		if (conf->changed & IEEE80211_IFCC_BEACON_ENABLED) {

			u32 interval;



			if (conf->enable_beacon)

				interval = BCN_MODE_IBSS | hw->conf.beacon_int;

			else

				interval = 0;



			r = zd_set_beacon_interval(&mac->chip, interval);

			if (r < 0)

				return r;

			kfree_skb(beacon);

		}

	} else

		associated = is_valid_ether_addr(conf->bssid);