[PATCH 3/3] d80211-p54: Add control structure for beacontemplates

[PATCH 3/3] d80211-p54: Add control structure for beacontemplates

[Ivo van Doorn]

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

p54 seems to ignore the beacon that is being passed,
even though it is requesting the BEACON_TEMPLATE.
That is why I not only added a line to free the control structure
but also the beacon itself.


Signed-off-by Ivo van Doorn <IvDoorn@gmail.com>

---

diff --git a/drivers/net/wireless/d80211/p54/prism54common.c b/drivers/net/wireless/d80211/p54/prism54common.c
index fd4ea5d..5a00d65 100644
--- a/drivers/net/wireless/d80211/p54/prism54common.c
+++ b/drivers/net/wireless/d80211/p54/prism54common.c
@@ -714,6 +714,8 @@ static int p54_config_interface(struct ieee80211_hw *dev, int if_id,
 	p54_set_filter(dev, 0, dev->perm_addr, conf->bssid, 0, 1, 0, 0xF642);
 	p54_set_filter(dev, 0, dev->perm_addr, conf->bssid, 2, 0, 0, 0);
 	p54_set_leds(dev, 1, !is_multicast_ether_addr(conf->bssid), 0);
+	dev_kfree_skb(conf->beacon);
+	kfree(conf->beacon_control);
 	return 0;
 }
 

Re: [PATCH 3/3] d80211-p54: Add control structure for beacontemplates

[Michael Wu]

[-- Attachment #1: Type: text/plain, Size: 484 bytes --]

On Saturday 03 February 2007 11:25, Ivo van Doorn wrote:
> p54 seems to ignore the beacon that is being passed,
> even though it is requesting the BEACON_TEMPLATE.
> That is why I not only added a line to free the control structure
> but also the beacon itself.
>
Yeah, beacons aren't actually handled yet. BEACON_TEMPLATE can just be turned 
off for now if it's causing problems, though I don't see a reason why a 
beacon would be generated for managed mode.

-Michael Wu

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: [PATCH 3/3] d80211-p54: Add control structure for beacontemplates

[Ivo van Doorn]

On Saturday 03 February 2007 17:33, Michael Wu wrote:
> On Saturday 03 February 2007 11:25, Ivo van Doorn wrote:
> > p54 seems to ignore the beacon that is being passed,
> > even though it is requesting the BEACON_TEMPLATE.
> > That is why I not only added a line to free the control structure
> > but also the beacon itself.
> >
> Yeah, beacons aren't actually handled yet. BEACON_TEMPLATE can just be turned 
> off for now if it's causing problems, though I don't see a reason why a 
> beacon would be generated for managed mode.

It would only be generated for AP mode.
In any case, the new patch:

Signed-off-by Ivo van Doorn <IvDoorn@gmail.com>

---

diff --git a/drivers/net/wireless/d80211/p54/prism54common.c b/drivers/net/wireless/d80211/p54/prism54common.c
index fd4ea5d..8335f99 100644
--- a/drivers/net/wireless/d80211/p54/prism54common.c
+++ b/drivers/net/wireless/d80211/p54/prism54common.c
@@ -766,8 +766,7 @@ struct ieee80211_hw *p54_init_common(size_t priv_data_len)
 	priv->modes[0].rates = priv->rates;
 	priv->modes[0].num_channels = ARRAY_SIZE(p54_channels);
 	priv->modes[0].channels = priv->channels;
-	dev->flags = IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE |
-		    IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING | /* not sure */
+	dev->flags = IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING | /* not sure */
 		    IEEE80211_HW_RX_INCLUDES_FCS |
 		    IEEE80211_HW_WEP_INCLUDE_IV |
 		    IEEE80211_HW_DATA_NULLFUNC_ACK; /* TODO: check */

Re: [PATCH 3/3] d80211-p54: Add control structure for beacontemplates

[Michael Wu]

[-- Attachment #1: Type: text/plain, Size: 208 bytes --]

On Saturday 03 February 2007 11:40, Ivo van Doorn wrote:
> It would only be generated for AP mode.
> In any case, the new patch:
>
> Signed-off-by Ivo van Doorn <IvDoorn@gmail.com>
>
ACK

Thanks,
-Michael Wu

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]