From: Johannes Berg <johannes@sipsolutions.net>
To: andrea.merello@gmail.com
Cc: emmanuel.grumbach@intel.com,
Linux Wireless List <linux-wireless@vger.kernel.org>,
joerg.albert@gmx.de, Alex Stewart <alex@foogod.com>,
n0_5p4m_p13453@hotmail.com, Pavel Roskin <proski@gnu.org>,
agx@sigxcpu.org, Kalle Valo <kalle.valo@iki.fi>,
sesmo@gmx.net, John Linville <linville@tuxdriver.com>
Subject: Re: [RFC] mac80211: at76x50x_usb driver broken by commit 3afc216.. and RX path involved in scan
Date: Tue, 03 Jun 2014 21:57:42 +0200 [thread overview]
Message-ID: <1401825462.4157.42.camel@jlt4.sipsolutions.net> (raw)
In-Reply-To: <CAN8YU5Mxxqs1H4caXQ_tS0Sq5YKwk9NatgSqWferCqBu_+jnyQ@mail.gmail.com> (sfid-20140531_205434_951215_79D9D36D)
Hi Andrea,
On Sat, 2014-05-31 at 20:54 +0200, Andrea Merello wrote:
> Hello,
> I found some useful helper function in mac80211, and I used some of
> them, but unfortunately I finally parsed information element in
> beacon/probe-response by myself:
> I found the utility ieee802_11_parse_elems(), but it seems that it
> relies on structures that are declared in some .h file located locally
> to mac80211.. So I suppose it is not intended for use outside
> mac80211, is it?
Yeah, and it would do much more than what you want. You could use
cfg80211_find_ie() though to simplify the code.
> +/* This is a workaround to make scan working:
> + * currently mac80211 does not process frames with no frequency
> + * information.
> + * However during scan the HW performs a sweep by itself, and we
> + * are unable to know where the radio is actually tuned.
> + * This function tries to do its best to guess this information..
> + * If the current frame is a beacon or a probe response, the channel
> + * information is extracted from it.
> + * For other frames, or if it happen that for whatever reason we fail
> + * to parse beacons and probe responses, this function returns
> + * the priv->channel information, that should be valid at least
> + * when we are NOT scanning.
> + */
> +static int at76_parse_freq(struct at76_priv *priv)
> +{
> + size_t el_off;
> + u8 id;
> + u8 *el;
> + int el_len;
> + int channel = priv->channel;
> + int len = priv->rx_skb->len;
> + struct ieee80211_hdr *hdr = (void *)priv->rx_skb->data;
> +
> + if (len < 24)
> + goto exit;
> +
> + if (ieee80211_is_probe_resp(hdr->frame_control)) {
> + el_off = offsetof(struct ieee80211_mgmt, u.probe_resp.variable);
> + el = ((struct ieee80211_mgmt *)hdr)->u.probe_resp.variable;
> + } else if (ieee80211_is_beacon(hdr->frame_control)) {
> + el_off = offsetof(struct ieee80211_mgmt, u.beacon.variable);
> + el = ((struct ieee80211_mgmt *)hdr)->u.beacon.variable;
> + } else
> + goto exit;
> +
> + len -= el_off;
> +
> + while (len >= 2) {
> + id = *el++;
> + el_len = *el++;
> + len -= 2;
> +
> + if (id == WLAN_EID_DS_PARAMS) {
> + if ((el_len > 0) && (len >= el_len))
> + channel = *el;
> + break;
> + }
> + len -= el_len;
> + el += el_len;
> + }
So the loop can be simplified to
el = cfg80211_find_ie(WLAN_EID_DS_PARAMS, el, el_len);
if (el && el[1] > 0)
channel = el[2];
> @@ -1542,6 +1597,8 @@ static void at76_rx_tasklet(unsigned long param)
> rx_status.signal = buf->rssi;
> rx_status.flag |= RX_FLAG_DECRYPTED;
> rx_status.flag |= RX_FLAG_IV_STRIPPED;
> + rx_status.band = IEEE80211_BAND_2GHZ;
> + rx_status.freq = at76_parse_freq(priv);
You might also invoke this only when you know you're scanning, to avoid
the overhead otherwise, but with this driver it probably doesn't matter
much.
johannes
next prev parent reply other threads:[~2014-06-03 19:58 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-17 15:42 [RFC] mac80211: at76x50x_usb driver broken by commit 3afc216.. and RX path involved in scan Andrea Merello
2014-05-18 7:10 ` Grumbach, Emmanuel
2014-05-19 14:29 ` Johannes Berg
2014-05-19 14:49 ` Johannes Berg
2014-05-19 15:42 ` Andrea Merello
2014-05-19 16:02 ` Johannes Berg
2014-05-19 16:05 ` Andrea Merello
2014-05-26 11:53 ` Andrea Merello
2014-05-28 14:02 ` Johannes Berg
2014-05-31 18:54 ` Andrea Merello
2014-06-03 19:57 ` Johannes Berg [this message]
2014-06-04 21:02 ` Andrea Merello
2014-06-05 12:32 ` Johannes Berg
2014-06-05 14:10 ` [PATCH] at76c50x: fix scan does not work with latest mac80211 Andrea Merello
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=1401825462.4157.42.camel@jlt4.sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=agx@sigxcpu.org \
--cc=alex@foogod.com \
--cc=andrea.merello@gmail.com \
--cc=emmanuel.grumbach@intel.com \
--cc=joerg.albert@gmx.de \
--cc=kalle.valo@iki.fi \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=n0_5p4m_p13453@hotmail.com \
--cc=proski@gnu.org \
--cc=sesmo@gmx.net \
/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