From: Michael Buesch <mb@bu3sch.de>
To: Jiri Benc <jbenc@suse.cz>, "John W. Linville" <linville@tuxdriver.com>
Cc: netdev@vger.kernel.org, Alexander Tsvyashchenko <lists@ndl.kiev.ua>
Subject: Re: [PATCH 3/3] bcm43xx-d80211: use host_gen_beacon_template
Date: Fri, 23 Jun 2006 23:12:15 +0200 [thread overview]
Message-ID: <200606232312.16289.mb@bu3sch.de> (raw)
In-Reply-To: <20060623181636.6DC1C483AD@silver.suse.cz>
On Friday 23 June 2006 20:16, Jiri Benc wrote:
> Use new host_gen_beacon_template flag. This also means workaround with
> "iwconfig essid" after hostapd is run is not necessary anymore.
>
> Signed-off-by: Jiri Benc <jbenc@suse.cz>
Signed-off-by: Michael Buesch <mb@bu3sch.de>
John, please apply.
> ---
>
> drivers/net/wireless/d80211/bcm43xx/bcm43xx_main.c | 36 ++++++---------------
> 1 files changed, 11 insertions(+), 25 deletions(-)
>
> --- dscape.orig/drivers/net/wireless/d80211/bcm43xx/bcm43xx_main.c
> +++ dscape/drivers/net/wireless/d80211/bcm43xx/bcm43xx_main.c
> @@ -1710,17 +1710,12 @@ static void bcm43xx_write_probe_resp_tem
> kfree(probe_resp_data);
> }
>
> -static int bcm43xx_refresh_cached_beacon(struct bcm43xx_private *bcm)
> +static int bcm43xx_refresh_cached_beacon(struct bcm43xx_private *bcm,
> + struct sk_buff *beacon)
> {
> - struct ieee80211_tx_control control;
> -
> if (bcm->cached_beacon)
> kfree_skb(bcm->cached_beacon);
> - bcm->cached_beacon = ieee80211_beacon_get(bcm->net_dev,
> - bcm->interface.if_id,
> - &control);
> - if (unlikely(!bcm->cached_beacon))
> - return -ENOMEM;
> + bcm->cached_beacon = beacon;
>
> return 0;
> }
> @@ -1743,16 +1738,15 @@ static void bcm43xx_update_templates(str
> bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS2_BITFIELD, status);
> }
>
> -static void bcm43xx_refresh_templates(struct bcm43xx_private *bcm)
> +static void bcm43xx_refresh_templates(struct bcm43xx_private *bcm,
> + struct sk_buff *beacon)
> {
> int err;
>
> - err = bcm43xx_refresh_cached_beacon(bcm);
> + err = bcm43xx_refresh_cached_beacon(bcm, beacon);
> if (unlikely(err))
> return;
> bcm43xx_update_templates(bcm);
> - kfree_skb(bcm->cached_beacon);
> - bcm->cached_beacon = NULL;
> }
>
> static void bcm43xx_set_ssid(struct bcm43xx_private *bcm,
> @@ -1792,19 +1786,11 @@ static void bcm43xx_set_beacon_int(struc
> static void handle_irq_beacon(struct bcm43xx_private *bcm)
> {
> u32 status;
> - int err;
>
> bcm->irq_savedstate &= ~BCM43xx_IRQ_BEACON;
> status = bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS2_BITFIELD);
>
> - if (!bcm->cached_beacon) {
> - err = bcm43xx_refresh_cached_beacon(bcm);
> - if (unlikely(err))
> - goto ack;
> - }
> -
> - if ((status & 0x1) && (status & 0x2)) {
> -ack:
> + if (!bcm->cached_beacon || ((status & 0x1) && (status & 0x2))) {
> /* ACK beacon IRQ. */
> bcm43xx_write32(bcm, BCM43xx_MMIO_GEN_IRQ_REASON,
> BCM43xx_IRQ_BEACON);
> @@ -4382,7 +4368,6 @@ static int bcm43xx_net_config(struct net
>
> if (bcm43xx_is_mode(bcm, IEEE80211_IF_TYPE_AP)) {
> bcm43xx_set_beacon_int(bcm, conf->beacon_int);
> - bcm43xx_refresh_templates(bcm);
> }
>
> bcm43xx_unlock_irqonly(bcm, flags);
> @@ -4553,7 +4538,7 @@ static int bcm43xx_add_interface(struct
> if (bcm43xx_status(bcm) == BCM43xx_STAT_INITIALIZED) {
> bcm43xx_select_opmode(bcm);
> if (bcm43xx_is_mode(bcm, IEEE80211_IF_TYPE_AP))
> - bcm43xx_refresh_templates(bcm);
> + bcm43xx_refresh_templates(bcm, NULL);
> }
> err = 0;
>
> @@ -4606,7 +4591,8 @@ static int bcm43xx_config_interface(stru
> if (bcm43xx_is_mode(bcm, IEEE80211_IF_TYPE_AP)) {
> assert(conf->type == IEEE80211_IF_TYPE_AP);
> bcm43xx_set_ssid(bcm, conf->ssid, conf->ssid_len);
> - bcm43xx_refresh_templates(bcm);
> + if (conf->beacon)
> + bcm43xx_refresh_templates(bcm, conf->beacon);
> }
> }
> bcm43xx_unlock_irqsafe(bcm, flags);
> @@ -4701,7 +4687,7 @@ static int __devinit bcm43xx_init_one(st
> goto out;
> ieee->version = IEEE80211_VERSION;
> ieee->name = KBUILD_MODNAME;
> - ieee->host_gen_beacon = 1;
> + ieee->host_gen_beacon_template = 1;
> ieee->rx_includes_fcs = 1;
> ieee->monitor_during_oper = 1;
> ieee->tx = bcm43xx_net_hard_start_xmit;
>
--
Greetings Michael.
next prev parent reply other threads:[~2006-06-23 21:13 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-06-23 18:16 [PATCH 0/3] d80211: AP mode fixes Jiri Benc
2006-06-23 18:16 ` [PATCH 1/3] d80211: do not receive through master interface Jiri Benc
2006-06-24 11:50 ` [PATCH 1/3] d80211: experimental: do not receive through master interface when not scanning Jiri Benc
2006-06-23 18:16 ` [PATCH 2/3] d80211: host_gen_beacon_template flag Jiri Benc
2006-06-23 18:16 ` [PATCH 3/3] bcm43xx-d80211: use host_gen_beacon_template Jiri Benc
2006-06-23 21:12 ` Michael Buesch [this message]
2006-06-24 11:17 ` Jiri Benc
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200606232312.16289.mb@bu3sch.de \
--to=mb@bu3sch.de \
--cc=jbenc@suse.cz \
--cc=linville@tuxdriver.com \
--cc=lists@ndl.kiev.ua \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).