From: Michael Buesch <mb@bu3sch.de>
To: linville@tuxdriver.com, Jiri Benc <jbenc@suse.cz>
Cc: netdev@vger.kernel.org, bcm43xx-dev@lists.berlios.de
Subject: [PATCH] d80211: allow NULL for control in beacon_get
Date: Sat, 17 Jun 2006 23:10:10 +0200 [thread overview]
Message-ID: <200606172310.10690.mb@bu3sch.de> (raw)
bcm43xx has no use for the "control" data provided by
ieee80211_beacon_get(), so allow passing a NULL pointer
to avoid setting up a dummy struct and throwing the data
away afterwards in the driver.
Signed-off-by: Michael Buesch <mb@bu3sch.de>
Index: wireless-dev/net/d80211/ieee80211.c
===================================================================
--- wireless-dev.orig/net/d80211/ieee80211.c 2006-06-17 22:51:20.000000000 +0200
+++ wireless-dev/net/d80211/ieee80211.c 2006-06-17 23:03:54.000000000 +0200
@@ -1683,28 +1683,30 @@
memcpy(skb_put(skb, bt_len), b_tail, bt_len);
}
- memset(&extra, 0, sizeof(extra));
- extra.endidx = local->num_curr_rates;
+ if (control) {
+ memset(&extra, 0, sizeof(extra));
+ extra.endidx = local->num_curr_rates;
- rate = rate_control_get_rate(dev, skb, &extra);
- if (rate == NULL) {
- if (net_ratelimit()) {
- printk(KERN_DEBUG "%s: ieee80211_beacon_get: no rate "
- "found\n", dev->name);
+ rate = rate_control_get_rate(dev, skb, &extra);
+ if (rate == NULL) {
+ if (net_ratelimit()) {
+ printk(KERN_DEBUG "%s: ieee80211_beacon_get: no rate "
+ "found\n", dev->name);
+ }
+ dev_kfree_skb(skb);
+ return NULL;
}
- dev_kfree_skb(skb);
- return NULL;
- }
- control->tx_rate = (local->short_preamble &&
- (rate->flags & IEEE80211_RATE_PREAMBLE2)) ?
- rate->val2 : rate->val;
- control->antenna_sel = local->conf.antenna_sel;
- control->power_level = local->conf.power_level;
- control->no_ack = 1;
- control->retry_limit = 1;
- control->rts_cts_duration = 0;
- control->clear_dst_mask = 1;
+ control->tx_rate = (local->short_preamble &&
+ (rate->flags & IEEE80211_RATE_PREAMBLE2)) ?
+ rate->val2 : rate->val;
+ control->antenna_sel = local->conf.antenna_sel;
+ control->power_level = local->conf.power_level;
+ control->no_ack = 1;
+ control->retry_limit = 1;
+ control->rts_cts_duration = 0;
+ control->clear_dst_mask = 1;
+ }
ap->num_beacons++;
return skb;
--
Greetings Michael.
reply other threads:[~2006-06-17 21:13 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=200606172310.10690.mb@bu3sch.de \
--to=mb@bu3sch.de \
--cc=bcm43xx-dev@lists.berlios.de \
--cc=jbenc@suse.cz \
--cc=linville@tuxdriver.com \
--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).