Skip to contentSkip to conversation

d80211-bcm43xx: Add control structure for beacontemplates

PATCH Superseded Ivo van Doorn 2 participants 2 messages Feb 3, 2007

Subsystems (3)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 2/3 d80211-bcm43xx: Add control structure for beacontemplates

Drivers that require beacon templates will also have the control structure at their disposal and should always free it.

bcm43xx doesn't use the control structure, but should still free it.

Signed-off-by Ivo van Doorn <[email protected]>

---

drivers/net/wireless/d80211/bcm43xx/bcm43xx_main.c +3 -1
index 9f4d51d..24be8f5 100644
@@ -2732,8 +2732,10 @@ static int bcm43xx_config_interface(struct ieee80211_hw *hw,
 		if (bcm43xx_is_mode(wl, IEEE80211_IF_TYPE_AP)) {
 			assert(conf->type == IEEE80211_IF_TYPE_AP);
 			bcm43xx_set_ssid(dev, conf->ssid, conf->ssid_len);
-			if (conf->beacon)
+			if (conf->beacon) {
 				bcm43xx_refresh_templates(dev, conf->beacon);
+				kfree(conf->beacon_control);
+			}
 		}
 	}
 	spin_unlock_irqrestore(&wl->irq_lock, flags);
#1 lore raw
Quoted 14 lines · Ivo van Doorn

Drivers that require beacon templates will also have the control structure at their disposal and should always free it.

bcm43xx doesn't use the control structure, but should still free it.

Signed-off-by Ivo van Doorn <[email protected]>

---

drivers/net/wireless/d80211/bcm43xx/bcm43xx_main.c +0 -0
index 9f4d51d..24be8f5 100644

drivers/net/wireless/d80211/bcm43xx/bcm43xx_main.c static int bcm43xx_config_interface(struct ieee80211_hw *hw, · line 2740

Quoted 10 lines
drivers/net/wireless/d80211/bcm43xx/bcm43xx_main.c +3 -1
@@ -2732,8 +2732,10 @@ static int bcm43xx_config_interface(struct ieee80211_hw *hw,
 		if (bcm43xx_is_mode(wl, IEEE80211_IF_TYPE_AP)) {
 			assert(conf->type == IEEE80211_IF_TYPE_AP);
 			bcm43xx_set_ssid(dev, conf->ssid, conf->ssid_len);
-			if (conf->beacon)
+			if (conf->beacon) {
 				bcm43xx_refresh_templates(dev, conf->beacon);
+				kfree(conf->beacon_control);
+			}
 		}
 	}

ACK to this patch, for now.
I will take care to actually properly set the beacon tx control parameters in hardware (the possible ones) with a later patch.

Signature · 1 line
Greetings Michael.