2007-07-27 15:43:23 +02:00
|
|
|
/*
|
|
|
|
* Copyright 2002-2005, Instant802 Networks, Inc.
|
|
|
|
* Copyright 2005-2006, Devicescape Software, Inc.
|
|
|
|
* Copyright 2006-2007 Jiri Benc <jbenc@suse.cz>
|
|
|
|
* Copyright 2007 Johannes Berg <johannes@sipsolutions.net>
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
|
|
* published by the Free Software Foundation.
|
|
|
|
*
|
|
|
|
* utilities for mac80211
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <net/mac80211.h>
|
|
|
|
#include <linux/netdevice.h>
|
|
|
|
#include <linux/types.h>
|
|
|
|
#include <linux/slab.h>
|
|
|
|
#include <linux/skbuff.h>
|
|
|
|
#include <linux/etherdevice.h>
|
|
|
|
#include <linux/if_arp.h>
|
|
|
|
#include <linux/wireless.h>
|
|
|
|
#include <linux/bitmap.h>
|
mac80211: implement beacon filtering in software
Regardless of whether the hardware implements beacon filtering,
there's no need to process all beacons in software all the time
throughout the stack (mac80211 does a lot, then cfg80211, then
in the future possibly userspace).
This patch implements the "best possible" beacon filtering in
mac80211. "Best possible" means that it can look for changes in
all requested information elements, and distinguish vendor IEs
by their OUI.
In the future, we will add nl80211 API for userspace to request
information elements and vendor IE OUIs to watch -- drivers can
then implement the best they can do while software implements
it fully.
It is unclear whether or not this actually saves CPU time, but
the data is all in the cache already so it should be fairly
cheap. The additional _testing_, however, has great benefit;
Without this, and on hardware that doesn't implement beacon
filtering, wrong assumptions about, for example, scan result
updates could quickly creep into code.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-04-16 13:17:26 +02:00
|
|
|
#include <linux/crc32.h>
|
2007-09-17 20:56:21 +02:00
|
|
|
#include <net/net_namespace.h>
|
2007-07-27 15:43:23 +02:00
|
|
|
#include <net/cfg80211.h>
|
2007-11-09 01:57:29 +01:00
|
|
|
#include <net/rtnetlink.h>
|
2007-07-27 15:43:23 +02:00
|
|
|
|
|
|
|
#include "ieee80211_i.h"
|
2009-04-23 18:52:52 +02:00
|
|
|
#include "driver-ops.h"
|
2008-04-08 21:14:40 +02:00
|
|
|
#include "rate.h"
|
2008-02-23 15:17:11 +01:00
|
|
|
#include "mesh.h"
|
2007-07-27 15:43:23 +02:00
|
|
|
#include "wme.h"
|
2009-04-14 10:09:24 +02:00
|
|
|
#include "led.h"
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 14:22:54 +02:00
|
|
|
#include "wep.h"
|
2007-07-27 15:43:23 +02:00
|
|
|
|
|
|
|
/* privid for wiphys to determine whether they belong to us or not */
|
|
|
|
void *mac80211_wiphy_privid = &mac80211_wiphy_privid;
|
|
|
|
|
2009-01-23 00:05:53 +01:00
|
|
|
struct ieee80211_hw *wiphy_to_ieee80211_hw(struct wiphy *wiphy)
|
|
|
|
{
|
|
|
|
struct ieee80211_local *local;
|
|
|
|
BUG_ON(!wiphy);
|
|
|
|
|
|
|
|
local = wiphy_priv(wiphy);
|
|
|
|
return &local->hw;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(wiphy_to_ieee80211_hw);
|
2007-07-27 15:43:23 +02:00
|
|
|
|
2007-12-25 16:00:36 +01:00
|
|
|
u8 *ieee80211_get_bssid(struct ieee80211_hdr *hdr, size_t len,
|
2008-09-11 00:01:58 +02:00
|
|
|
enum nl80211_iftype type)
|
2007-07-27 15:43:23 +02:00
|
|
|
{
|
2008-06-11 23:21:58 +02:00
|
|
|
__le16 fc = hdr->frame_control;
|
2007-07-27 15:43:23 +02:00
|
|
|
|
2007-12-18 16:23:53 +01:00
|
|
|
/* drop ACK/CTS frames and incorrect hdr len (ctrl) */
|
|
|
|
if (len < 16)
|
2007-07-27 15:43:23 +02:00
|
|
|
return NULL;
|
|
|
|
|
2008-06-11 23:21:58 +02:00
|
|
|
if (ieee80211_is_data(fc)) {
|
2007-12-18 16:23:53 +01:00
|
|
|
if (len < 24) /* drop incorrect hdr len (data) */
|
|
|
|
return NULL;
|
2008-06-11 23:21:58 +02:00
|
|
|
|
|
|
|
if (ieee80211_has_a4(fc))
|
2007-07-27 15:43:23 +02:00
|
|
|
return NULL;
|
2008-06-11 23:21:58 +02:00
|
|
|
if (ieee80211_has_tods(fc))
|
|
|
|
return hdr->addr1;
|
|
|
|
if (ieee80211_has_fromds(fc))
|
2007-07-27 15:43:23 +02:00
|
|
|
return hdr->addr2;
|
2008-06-11 23:21:58 +02:00
|
|
|
|
|
|
|
return hdr->addr3;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ieee80211_is_mgmt(fc)) {
|
2007-12-18 16:23:53 +01:00
|
|
|
if (len < 24) /* drop incorrect hdr len (mgmt) */
|
|
|
|
return NULL;
|
2007-07-27 15:43:23 +02:00
|
|
|
return hdr->addr3;
|
2008-06-11 23:21:58 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (ieee80211_is_ctl(fc)) {
|
|
|
|
if(ieee80211_is_pspoll(fc))
|
2007-07-27 15:43:23 +02:00
|
|
|
return hdr->addr1;
|
2008-06-11 23:21:58 +02:00
|
|
|
|
|
|
|
if (ieee80211_is_back_req(fc)) {
|
2007-12-25 16:00:36 +01:00
|
|
|
switch (type) {
|
2008-09-11 00:01:58 +02:00
|
|
|
case NL80211_IFTYPE_STATION:
|
2007-12-25 16:00:36 +01:00
|
|
|
return hdr->addr2;
|
2008-09-11 00:01:58 +02:00
|
|
|
case NL80211_IFTYPE_AP:
|
|
|
|
case NL80211_IFTYPE_AP_VLAN:
|
2007-12-25 16:00:36 +01:00
|
|
|
return hdr->addr1;
|
|
|
|
default:
|
2008-06-11 23:21:58 +02:00
|
|
|
break; /* fall through to the return */
|
2007-12-25 16:00:36 +01:00
|
|
|
}
|
|
|
|
}
|
2007-07-27 15:43:23 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2008-02-25 16:27:43 +01:00
|
|
|
void ieee80211_tx_set_protected(struct ieee80211_tx_data *tx)
|
2007-07-27 15:43:23 +02:00
|
|
|
{
|
2009-03-23 17:28:35 +01:00
|
|
|
struct sk_buff *skb = tx->skb;
|
|
|
|
struct ieee80211_hdr *hdr;
|
|
|
|
|
|
|
|
do {
|
|
|
|
hdr = (struct ieee80211_hdr *) skb->data;
|
|
|
|
hdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_PROTECTED);
|
|
|
|
} while ((skb = skb->next));
|
2007-07-27 15:43:23 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
int ieee80211_frame_duration(struct ieee80211_local *local, size_t len,
|
|
|
|
int rate, int erp, int short_preamble)
|
|
|
|
{
|
|
|
|
int dur;
|
|
|
|
|
|
|
|
/* calculate duration (in microseconds, rounded up to next higher
|
|
|
|
* integer if it includes a fractional microsecond) to send frame of
|
|
|
|
* len bytes (does not include FCS) at the given rate. Duration will
|
|
|
|
* also include SIFS.
|
|
|
|
*
|
|
|
|
* rate is in 100 kbps, so divident is multiplied by 10 in the
|
|
|
|
* DIV_ROUND_UP() operations.
|
|
|
|
*/
|
|
|
|
|
2008-01-24 19:38:38 +01:00
|
|
|
if (local->hw.conf.channel->band == IEEE80211_BAND_5GHZ || erp) {
|
2007-07-27 15:43:23 +02:00
|
|
|
/*
|
|
|
|
* OFDM:
|
|
|
|
*
|
|
|
|
* N_DBPS = DATARATE x 4
|
|
|
|
* N_SYM = Ceiling((16+8xLENGTH+6) / N_DBPS)
|
|
|
|
* (16 = SIGNAL time, 6 = tail bits)
|
|
|
|
* TXTIME = T_PREAMBLE + T_SIGNAL + T_SYM x N_SYM + Signal Ext
|
|
|
|
*
|
|
|
|
* T_SYM = 4 usec
|
|
|
|
* 802.11a - 17.5.2: aSIFSTime = 16 usec
|
|
|
|
* 802.11g - 19.8.4: aSIFSTime = 10 usec +
|
|
|
|
* signal ext = 6 usec
|
|
|
|
*/
|
|
|
|
dur = 16; /* SIFS + signal ext */
|
|
|
|
dur += 16; /* 17.3.2.3: T_PREAMBLE = 16 usec */
|
|
|
|
dur += 4; /* 17.3.2.3: T_SIGNAL = 4 usec */
|
|
|
|
dur += 4 * DIV_ROUND_UP((16 + 8 * (len + 4) + 6) * 10,
|
|
|
|
4 * rate); /* T_SYM x N_SYM */
|
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* 802.11b or 802.11g with 802.11b compatibility:
|
|
|
|
* 18.3.4: TXTIME = PreambleLength + PLCPHeaderTime +
|
|
|
|
* Ceiling(((LENGTH+PBCC)x8)/DATARATE). PBCC=0.
|
|
|
|
*
|
|
|
|
* 802.11 (DS): 15.3.3, 802.11b: 18.3.4
|
|
|
|
* aSIFSTime = 10 usec
|
|
|
|
* aPreambleLength = 144 usec or 72 usec with short preamble
|
|
|
|
* aPLCPHeaderLength = 48 usec or 24 usec with short preamble
|
|
|
|
*/
|
|
|
|
dur = 10; /* aSIFSTime = 10 usec */
|
|
|
|
dur += short_preamble ? (72 + 24) : (144 + 48);
|
|
|
|
|
|
|
|
dur += DIV_ROUND_UP(8 * (len + 4) * 10, rate);
|
|
|
|
}
|
|
|
|
|
|
|
|
return dur;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Exported duration function for driver use */
|
2007-12-19 01:31:26 +01:00
|
|
|
__le16 ieee80211_generic_frame_duration(struct ieee80211_hw *hw,
|
|
|
|
struct ieee80211_vif *vif,
|
2008-01-24 19:38:38 +01:00
|
|
|
size_t frame_len,
|
|
|
|
struct ieee80211_rate *rate)
|
2007-07-27 15:43:23 +02:00
|
|
|
{
|
|
|
|
struct ieee80211_local *local = hw_to_local(hw);
|
2008-09-12 22:52:47 +02:00
|
|
|
struct ieee80211_sub_if_data *sdata;
|
2007-07-27 15:43:23 +02:00
|
|
|
u16 dur;
|
|
|
|
int erp;
|
2008-09-12 22:52:47 +02:00
|
|
|
bool short_preamble = false;
|
2007-07-27 15:43:23 +02:00
|
|
|
|
2008-01-24 19:38:38 +01:00
|
|
|
erp = 0;
|
2008-09-12 22:52:47 +02:00
|
|
|
if (vif) {
|
|
|
|
sdata = vif_to_sdata(vif);
|
2008-10-11 01:51:51 +02:00
|
|
|
short_preamble = sdata->vif.bss_conf.use_short_preamble;
|
2008-09-12 22:52:47 +02:00
|
|
|
if (sdata->flags & IEEE80211_SDATA_OPERATING_GMODE)
|
|
|
|
erp = rate->flags & IEEE80211_RATE_ERP_G;
|
|
|
|
}
|
2008-01-24 19:38:38 +01:00
|
|
|
|
|
|
|
dur = ieee80211_frame_duration(local, frame_len, rate->bitrate, erp,
|
2008-09-12 22:52:47 +02:00
|
|
|
short_preamble);
|
2007-07-27 15:43:23 +02:00
|
|
|
|
|
|
|
return cpu_to_le16(dur);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(ieee80211_generic_frame_duration);
|
|
|
|
|
2007-12-19 01:31:26 +01:00
|
|
|
__le16 ieee80211_rts_duration(struct ieee80211_hw *hw,
|
|
|
|
struct ieee80211_vif *vif, size_t frame_len,
|
2008-05-15 12:55:29 +02:00
|
|
|
const struct ieee80211_tx_info *frame_txctl)
|
2007-07-27 15:43:23 +02:00
|
|
|
{
|
|
|
|
struct ieee80211_local *local = hw_to_local(hw);
|
|
|
|
struct ieee80211_rate *rate;
|
2008-09-12 22:52:47 +02:00
|
|
|
struct ieee80211_sub_if_data *sdata;
|
2007-12-28 14:32:58 +01:00
|
|
|
bool short_preamble;
|
2007-07-27 15:43:23 +02:00
|
|
|
int erp;
|
|
|
|
u16 dur;
|
2008-05-15 12:55:27 +02:00
|
|
|
struct ieee80211_supported_band *sband;
|
|
|
|
|
|
|
|
sband = local->hw.wiphy->bands[local->hw.conf.channel->band];
|
2007-07-27 15:43:23 +02:00
|
|
|
|
2008-09-12 22:52:47 +02:00
|
|
|
short_preamble = false;
|
2007-07-27 15:43:24 +02:00
|
|
|
|
2008-05-15 12:55:29 +02:00
|
|
|
rate = &sband->bitrates[frame_txctl->control.rts_cts_rate_idx];
|
2008-01-24 19:38:38 +01:00
|
|
|
|
|
|
|
erp = 0;
|
2008-09-12 22:52:47 +02:00
|
|
|
if (vif) {
|
|
|
|
sdata = vif_to_sdata(vif);
|
2008-10-11 01:51:51 +02:00
|
|
|
short_preamble = sdata->vif.bss_conf.use_short_preamble;
|
2008-09-12 22:52:47 +02:00
|
|
|
if (sdata->flags & IEEE80211_SDATA_OPERATING_GMODE)
|
|
|
|
erp = rate->flags & IEEE80211_RATE_ERP_G;
|
|
|
|
}
|
2007-07-27 15:43:23 +02:00
|
|
|
|
|
|
|
/* CTS duration */
|
2008-01-24 19:38:38 +01:00
|
|
|
dur = ieee80211_frame_duration(local, 10, rate->bitrate,
|
2007-07-27 15:43:23 +02:00
|
|
|
erp, short_preamble);
|
|
|
|
/* Data frame duration */
|
2008-01-24 19:38:38 +01:00
|
|
|
dur += ieee80211_frame_duration(local, frame_len, rate->bitrate,
|
2007-07-27 15:43:23 +02:00
|
|
|
erp, short_preamble);
|
|
|
|
/* ACK duration */
|
2008-01-24 19:38:38 +01:00
|
|
|
dur += ieee80211_frame_duration(local, 10, rate->bitrate,
|
2007-07-27 15:43:23 +02:00
|
|
|
erp, short_preamble);
|
|
|
|
|
|
|
|
return cpu_to_le16(dur);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(ieee80211_rts_duration);
|
|
|
|
|
2007-12-19 01:31:26 +01:00
|
|
|
__le16 ieee80211_ctstoself_duration(struct ieee80211_hw *hw,
|
|
|
|
struct ieee80211_vif *vif,
|
2007-07-27 15:43:23 +02:00
|
|
|
size_t frame_len,
|
2008-05-15 12:55:29 +02:00
|
|
|
const struct ieee80211_tx_info *frame_txctl)
|
2007-07-27 15:43:23 +02:00
|
|
|
{
|
|
|
|
struct ieee80211_local *local = hw_to_local(hw);
|
|
|
|
struct ieee80211_rate *rate;
|
2008-09-12 22:52:47 +02:00
|
|
|
struct ieee80211_sub_if_data *sdata;
|
2007-12-28 14:32:58 +01:00
|
|
|
bool short_preamble;
|
2007-07-27 15:43:23 +02:00
|
|
|
int erp;
|
|
|
|
u16 dur;
|
2008-05-15 12:55:27 +02:00
|
|
|
struct ieee80211_supported_band *sband;
|
|
|
|
|
|
|
|
sband = local->hw.wiphy->bands[local->hw.conf.channel->band];
|
2007-07-27 15:43:23 +02:00
|
|
|
|
2008-09-12 22:52:47 +02:00
|
|
|
short_preamble = false;
|
2007-07-27 15:43:24 +02:00
|
|
|
|
2008-05-15 12:55:29 +02:00
|
|
|
rate = &sband->bitrates[frame_txctl->control.rts_cts_rate_idx];
|
2008-01-24 19:38:38 +01:00
|
|
|
erp = 0;
|
2008-09-12 22:52:47 +02:00
|
|
|
if (vif) {
|
|
|
|
sdata = vif_to_sdata(vif);
|
2008-10-11 01:51:51 +02:00
|
|
|
short_preamble = sdata->vif.bss_conf.use_short_preamble;
|
2008-09-12 22:52:47 +02:00
|
|
|
if (sdata->flags & IEEE80211_SDATA_OPERATING_GMODE)
|
|
|
|
erp = rate->flags & IEEE80211_RATE_ERP_G;
|
|
|
|
}
|
2007-07-27 15:43:23 +02:00
|
|
|
|
|
|
|
/* Data frame duration */
|
2008-01-24 19:38:38 +01:00
|
|
|
dur = ieee80211_frame_duration(local, frame_len, rate->bitrate,
|
2007-07-27 15:43:23 +02:00
|
|
|
erp, short_preamble);
|
2008-05-15 12:55:29 +02:00
|
|
|
if (!(frame_txctl->flags & IEEE80211_TX_CTL_NO_ACK)) {
|
2007-07-27 15:43:23 +02:00
|
|
|
/* ACK duration */
|
2008-01-24 19:38:38 +01:00
|
|
|
dur += ieee80211_frame_duration(local, 10, rate->bitrate,
|
2007-07-27 15:43:23 +02:00
|
|
|
erp, short_preamble);
|
|
|
|
}
|
|
|
|
|
|
|
|
return cpu_to_le16(dur);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(ieee80211_ctstoself_duration);
|
|
|
|
|
2008-12-18 22:35:20 +01:00
|
|
|
static void __ieee80211_wake_queue(struct ieee80211_hw *hw, int queue,
|
|
|
|
enum queue_stop_reason reason)
|
2007-07-27 15:43:23 +02:00
|
|
|
{
|
|
|
|
struct ieee80211_local *local = hw_to_local(hw);
|
|
|
|
|
2009-03-23 17:28:42 +01:00
|
|
|
if (WARN_ON(queue >= hw->queues))
|
|
|
|
return;
|
2008-12-18 22:35:20 +01:00
|
|
|
|
mac80211: fix aggregation for hardware with ampdu queues
Hardware with AMPDU queues currently has broken aggregation.
This patch fixes it by making all A-MPDUs go over the regular AC queues,
but keeping track of the hardware queues in mac80211. As a first rough
version, it actually stops the AC queue for extended periods of time,
which can be removed by adding buffering internal to mac80211, but is
currently not a huge problem because people rarely use multiple TIDs
that are in the same AC (and iwlwifi currently doesn't operate as AP).
This is a short-term fix, my current medium-term plan, which I hope to
execute soon as well, but am not sure can finish before .30, looks like
this:
1) rework the internal queuing layer in mac80211 that we use for
fragments if the driver stopped queue in the middle of a fragmented
frame to be able to queue more frames at once (rather than just a
single frame with its fragments)
2) instead of stopping the entire AC queue, queue up the frames in a
per-station/per-TID queue during aggregation session initiation,
when the session has come up take all those frames and put them
onto the queue from 1)
3) push the ampdu queue layer abstraction this patch introduces in
mac80211 into the driver, and remove the virtual queue stuff from
mac80211 again
This plan will probably also affect ath9k in that mac80211 queues the
frames instead of passing them down, even when there are no ampdu queues.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-02-12 00:51:53 +01:00
|
|
|
__clear_bit(reason, &local->queue_stop_reasons[queue]);
|
|
|
|
|
|
|
|
if (local->queue_stop_reasons[queue] != 0)
|
|
|
|
/* someone still has this queue stopped */
|
|
|
|
return;
|
|
|
|
|
2009-06-17 17:43:56 +02:00
|
|
|
if (!skb_queue_empty(&local->pending[queue]))
|
|
|
|
tasklet_schedule(&local->tx_pending_tasklet);
|
2007-07-27 15:43:23 +02:00
|
|
|
}
|
2008-12-18 22:35:20 +01:00
|
|
|
|
mac80211: fix aggregation for hardware with ampdu queues
Hardware with AMPDU queues currently has broken aggregation.
This patch fixes it by making all A-MPDUs go over the regular AC queues,
but keeping track of the hardware queues in mac80211. As a first rough
version, it actually stops the AC queue for extended periods of time,
which can be removed by adding buffering internal to mac80211, but is
currently not a huge problem because people rarely use multiple TIDs
that are in the same AC (and iwlwifi currently doesn't operate as AP).
This is a short-term fix, my current medium-term plan, which I hope to
execute soon as well, but am not sure can finish before .30, looks like
this:
1) rework the internal queuing layer in mac80211 that we use for
fragments if the driver stopped queue in the middle of a fragmented
frame to be able to queue more frames at once (rather than just a
single frame with its fragments)
2) instead of stopping the entire AC queue, queue up the frames in a
per-station/per-TID queue during aggregation session initiation,
when the session has come up take all those frames and put them
onto the queue from 1)
3) push the ampdu queue layer abstraction this patch introduces in
mac80211 into the driver, and remove the virtual queue stuff from
mac80211 again
This plan will probably also affect ath9k in that mac80211 queues the
frames instead of passing them down, even when there are no ampdu queues.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-02-12 00:51:53 +01:00
|
|
|
void ieee80211_wake_queue_by_reason(struct ieee80211_hw *hw, int queue,
|
|
|
|
enum queue_stop_reason reason)
|
2008-12-18 22:35:20 +01:00
|
|
|
{
|
|
|
|
struct ieee80211_local *local = hw_to_local(hw);
|
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
spin_lock_irqsave(&local->queue_stop_reason_lock, flags);
|
|
|
|
__ieee80211_wake_queue(hw, queue, reason);
|
|
|
|
spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
|
|
|
|
}
|
|
|
|
|
|
|
|
void ieee80211_wake_queue(struct ieee80211_hw *hw, int queue)
|
|
|
|
{
|
|
|
|
ieee80211_wake_queue_by_reason(hw, queue,
|
|
|
|
IEEE80211_QUEUE_STOP_REASON_DRIVER);
|
|
|
|
}
|
2007-07-27 15:43:23 +02:00
|
|
|
EXPORT_SYMBOL(ieee80211_wake_queue);
|
|
|
|
|
2008-12-18 22:35:20 +01:00
|
|
|
static void __ieee80211_stop_queue(struct ieee80211_hw *hw, int queue,
|
|
|
|
enum queue_stop_reason reason)
|
2007-07-27 15:43:23 +02:00
|
|
|
{
|
|
|
|
struct ieee80211_local *local = hw_to_local(hw);
|
|
|
|
|
2009-03-23 17:28:42 +01:00
|
|
|
if (WARN_ON(queue >= hw->queues))
|
|
|
|
return;
|
mac80211: fix aggregation for hardware with ampdu queues
Hardware with AMPDU queues currently has broken aggregation.
This patch fixes it by making all A-MPDUs go over the regular AC queues,
but keeping track of the hardware queues in mac80211. As a first rough
version, it actually stops the AC queue for extended periods of time,
which can be removed by adding buffering internal to mac80211, but is
currently not a huge problem because people rarely use multiple TIDs
that are in the same AC (and iwlwifi currently doesn't operate as AP).
This is a short-term fix, my current medium-term plan, which I hope to
execute soon as well, but am not sure can finish before .30, looks like
this:
1) rework the internal queuing layer in mac80211 that we use for
fragments if the driver stopped queue in the middle of a fragmented
frame to be able to queue more frames at once (rather than just a
single frame with its fragments)
2) instead of stopping the entire AC queue, queue up the frames in a
per-station/per-TID queue during aggregation session initiation,
when the session has come up take all those frames and put them
onto the queue from 1)
3) push the ampdu queue layer abstraction this patch introduces in
mac80211 into the driver, and remove the virtual queue stuff from
mac80211 again
This plan will probably also affect ath9k in that mac80211 queues the
frames instead of passing them down, even when there are no ampdu queues.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-02-12 00:51:53 +01:00
|
|
|
|
2009-03-23 17:28:37 +01:00
|
|
|
__set_bit(reason, &local->queue_stop_reasons[queue]);
|
2007-07-27 15:43:23 +02:00
|
|
|
}
|
2008-12-18 22:35:20 +01:00
|
|
|
|
mac80211: fix aggregation for hardware with ampdu queues
Hardware with AMPDU queues currently has broken aggregation.
This patch fixes it by making all A-MPDUs go over the regular AC queues,
but keeping track of the hardware queues in mac80211. As a first rough
version, it actually stops the AC queue for extended periods of time,
which can be removed by adding buffering internal to mac80211, but is
currently not a huge problem because people rarely use multiple TIDs
that are in the same AC (and iwlwifi currently doesn't operate as AP).
This is a short-term fix, my current medium-term plan, which I hope to
execute soon as well, but am not sure can finish before .30, looks like
this:
1) rework the internal queuing layer in mac80211 that we use for
fragments if the driver stopped queue in the middle of a fragmented
frame to be able to queue more frames at once (rather than just a
single frame with its fragments)
2) instead of stopping the entire AC queue, queue up the frames in a
per-station/per-TID queue during aggregation session initiation,
when the session has come up take all those frames and put them
onto the queue from 1)
3) push the ampdu queue layer abstraction this patch introduces in
mac80211 into the driver, and remove the virtual queue stuff from
mac80211 again
This plan will probably also affect ath9k in that mac80211 queues the
frames instead of passing them down, even when there are no ampdu queues.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-02-12 00:51:53 +01:00
|
|
|
void ieee80211_stop_queue_by_reason(struct ieee80211_hw *hw, int queue,
|
|
|
|
enum queue_stop_reason reason)
|
2008-12-18 22:35:20 +01:00
|
|
|
{
|
|
|
|
struct ieee80211_local *local = hw_to_local(hw);
|
|
|
|
unsigned long flags;
|
|
|
|
|
|
|
|
spin_lock_irqsave(&local->queue_stop_reason_lock, flags);
|
|
|
|
__ieee80211_stop_queue(hw, queue, reason);
|
|
|
|
spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
|
|
|
|
}
|
|
|
|
|
|
|
|
void ieee80211_stop_queue(struct ieee80211_hw *hw, int queue)
|
|
|
|
{
|
|
|
|
ieee80211_stop_queue_by_reason(hw, queue,
|
|
|
|
IEEE80211_QUEUE_STOP_REASON_DRIVER);
|
|
|
|
}
|
2007-07-27 15:43:23 +02:00
|
|
|
EXPORT_SYMBOL(ieee80211_stop_queue);
|
|
|
|
|
2009-06-07 21:58:37 +02:00
|
|
|
void ieee80211_add_pending_skb(struct ieee80211_local *local,
|
|
|
|
struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
struct ieee80211_hw *hw = &local->hw;
|
|
|
|
unsigned long flags;
|
|
|
|
int queue = skb_get_queue_mapping(skb);
|
2009-07-27 10:33:31 +02:00
|
|
|
struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
|
|
|
|
|
|
|
|
if (WARN_ON(!info->control.vif)) {
|
2009-10-06 15:52:35 +02:00
|
|
|
kfree_skb(skb);
|
2009-07-27 10:33:31 +02:00
|
|
|
return;
|
|
|
|
}
|
2009-06-07 21:58:37 +02:00
|
|
|
|
|
|
|
spin_lock_irqsave(&local->queue_stop_reason_lock, flags);
|
|
|
|
__ieee80211_stop_queue(hw, queue, IEEE80211_QUEUE_STOP_REASON_SKB_ADD);
|
2009-06-17 17:43:56 +02:00
|
|
|
__skb_queue_tail(&local->pending[queue], skb);
|
2009-06-07 21:58:37 +02:00
|
|
|
__ieee80211_wake_queue(hw, queue, IEEE80211_QUEUE_STOP_REASON_SKB_ADD);
|
|
|
|
spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
|
|
|
|
}
|
|
|
|
|
|
|
|
int ieee80211_add_pending_skbs(struct ieee80211_local *local,
|
|
|
|
struct sk_buff_head *skbs)
|
|
|
|
{
|
|
|
|
struct ieee80211_hw *hw = &local->hw;
|
|
|
|
struct sk_buff *skb;
|
|
|
|
unsigned long flags;
|
|
|
|
int queue, ret = 0, i;
|
|
|
|
|
|
|
|
spin_lock_irqsave(&local->queue_stop_reason_lock, flags);
|
|
|
|
for (i = 0; i < hw->queues; i++)
|
|
|
|
__ieee80211_stop_queue(hw, i,
|
|
|
|
IEEE80211_QUEUE_STOP_REASON_SKB_ADD);
|
|
|
|
|
|
|
|
while ((skb = skb_dequeue(skbs))) {
|
2009-07-27 10:33:31 +02:00
|
|
|
struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
|
|
|
|
|
|
|
|
if (WARN_ON(!info->control.vif)) {
|
2009-10-06 15:52:35 +02:00
|
|
|
kfree_skb(skb);
|
2009-07-27 10:33:31 +02:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2009-06-07 21:58:37 +02:00
|
|
|
ret++;
|
|
|
|
queue = skb_get_queue_mapping(skb);
|
2009-06-17 17:43:56 +02:00
|
|
|
__skb_queue_tail(&local->pending[queue], skb);
|
2009-06-07 21:58:37 +02:00
|
|
|
}
|
|
|
|
|
2009-06-17 17:43:56 +02:00
|
|
|
for (i = 0; i < hw->queues; i++)
|
2009-06-07 21:58:37 +02:00
|
|
|
__ieee80211_wake_queue(hw, i,
|
|
|
|
IEEE80211_QUEUE_STOP_REASON_SKB_ADD);
|
|
|
|
spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2008-12-18 22:35:20 +01:00
|
|
|
void ieee80211_stop_queues_by_reason(struct ieee80211_hw *hw,
|
|
|
|
enum queue_stop_reason reason)
|
2007-07-27 15:43:23 +02:00
|
|
|
{
|
2008-12-18 22:35:20 +01:00
|
|
|
struct ieee80211_local *local = hw_to_local(hw);
|
|
|
|
unsigned long flags;
|
2007-07-27 15:43:23 +02:00
|
|
|
int i;
|
|
|
|
|
2008-12-18 22:35:20 +01:00
|
|
|
spin_lock_irqsave(&local->queue_stop_reason_lock, flags);
|
|
|
|
|
mac80211: fix aggregation for hardware with ampdu queues
Hardware with AMPDU queues currently has broken aggregation.
This patch fixes it by making all A-MPDUs go over the regular AC queues,
but keeping track of the hardware queues in mac80211. As a first rough
version, it actually stops the AC queue for extended periods of time,
which can be removed by adding buffering internal to mac80211, but is
currently not a huge problem because people rarely use multiple TIDs
that are in the same AC (and iwlwifi currently doesn't operate as AP).
This is a short-term fix, my current medium-term plan, which I hope to
execute soon as well, but am not sure can finish before .30, looks like
this:
1) rework the internal queuing layer in mac80211 that we use for
fragments if the driver stopped queue in the middle of a fragmented
frame to be able to queue more frames at once (rather than just a
single frame with its fragments)
2) instead of stopping the entire AC queue, queue up the frames in a
per-station/per-TID queue during aggregation session initiation,
when the session has come up take all those frames and put them
onto the queue from 1)
3) push the ampdu queue layer abstraction this patch introduces in
mac80211 into the driver, and remove the virtual queue stuff from
mac80211 again
This plan will probably also affect ath9k in that mac80211 queues the
frames instead of passing them down, even when there are no ampdu queues.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-02-12 00:51:53 +01:00
|
|
|
for (i = 0; i < hw->queues; i++)
|
2008-12-18 22:35:20 +01:00
|
|
|
__ieee80211_stop_queue(hw, i, reason);
|
|
|
|
|
|
|
|
spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
|
|
|
|
}
|
|
|
|
|
|
|
|
void ieee80211_stop_queues(struct ieee80211_hw *hw)
|
|
|
|
{
|
|
|
|
ieee80211_stop_queues_by_reason(hw,
|
|
|
|
IEEE80211_QUEUE_STOP_REASON_DRIVER);
|
2007-07-27 15:43:23 +02:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(ieee80211_stop_queues);
|
|
|
|
|
2008-07-24 20:02:04 +02:00
|
|
|
int ieee80211_queue_stopped(struct ieee80211_hw *hw, int queue)
|
|
|
|
{
|
|
|
|
struct ieee80211_local *local = hw_to_local(hw);
|
2009-06-17 17:43:56 +02:00
|
|
|
unsigned long flags;
|
|
|
|
int ret;
|
mac80211: fix aggregation for hardware with ampdu queues
Hardware with AMPDU queues currently has broken aggregation.
This patch fixes it by making all A-MPDUs go over the regular AC queues,
but keeping track of the hardware queues in mac80211. As a first rough
version, it actually stops the AC queue for extended periods of time,
which can be removed by adding buffering internal to mac80211, but is
currently not a huge problem because people rarely use multiple TIDs
that are in the same AC (and iwlwifi currently doesn't operate as AP).
This is a short-term fix, my current medium-term plan, which I hope to
execute soon as well, but am not sure can finish before .30, looks like
this:
1) rework the internal queuing layer in mac80211 that we use for
fragments if the driver stopped queue in the middle of a fragmented
frame to be able to queue more frames at once (rather than just a
single frame with its fragments)
2) instead of stopping the entire AC queue, queue up the frames in a
per-station/per-TID queue during aggregation session initiation,
when the session has come up take all those frames and put them
onto the queue from 1)
3) push the ampdu queue layer abstraction this patch introduces in
mac80211 into the driver, and remove the virtual queue stuff from
mac80211 again
This plan will probably also affect ath9k in that mac80211 queues the
frames instead of passing them down, even when there are no ampdu queues.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-02-12 00:51:53 +01:00
|
|
|
|
2009-03-23 17:28:42 +01:00
|
|
|
if (WARN_ON(queue >= hw->queues))
|
|
|
|
return true;
|
mac80211: fix aggregation for hardware with ampdu queues
Hardware with AMPDU queues currently has broken aggregation.
This patch fixes it by making all A-MPDUs go over the regular AC queues,
but keeping track of the hardware queues in mac80211. As a first rough
version, it actually stops the AC queue for extended periods of time,
which can be removed by adding buffering internal to mac80211, but is
currently not a huge problem because people rarely use multiple TIDs
that are in the same AC (and iwlwifi currently doesn't operate as AP).
This is a short-term fix, my current medium-term plan, which I hope to
execute soon as well, but am not sure can finish before .30, looks like
this:
1) rework the internal queuing layer in mac80211 that we use for
fragments if the driver stopped queue in the middle of a fragmented
frame to be able to queue more frames at once (rather than just a
single frame with its fragments)
2) instead of stopping the entire AC queue, queue up the frames in a
per-station/per-TID queue during aggregation session initiation,
when the session has come up take all those frames and put them
onto the queue from 1)
3) push the ampdu queue layer abstraction this patch introduces in
mac80211 into the driver, and remove the virtual queue stuff from
mac80211 again
This plan will probably also affect ath9k in that mac80211 queues the
frames instead of passing them down, even when there are no ampdu queues.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-02-12 00:51:53 +01:00
|
|
|
|
2009-06-17 17:43:56 +02:00
|
|
|
spin_lock_irqsave(&local->queue_stop_reason_lock, flags);
|
|
|
|
ret = !!local->queue_stop_reasons[queue];
|
|
|
|
spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
|
|
|
|
return ret;
|
2008-07-24 20:02:04 +02:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(ieee80211_queue_stopped);
|
|
|
|
|
2008-12-18 22:35:20 +01:00
|
|
|
void ieee80211_wake_queues_by_reason(struct ieee80211_hw *hw,
|
|
|
|
enum queue_stop_reason reason)
|
2007-07-27 15:43:23 +02:00
|
|
|
{
|
2008-12-18 22:35:20 +01:00
|
|
|
struct ieee80211_local *local = hw_to_local(hw);
|
|
|
|
unsigned long flags;
|
2007-07-27 15:43:23 +02:00
|
|
|
int i;
|
|
|
|
|
2008-12-18 22:35:20 +01:00
|
|
|
spin_lock_irqsave(&local->queue_stop_reason_lock, flags);
|
|
|
|
|
2009-03-23 17:28:42 +01:00
|
|
|
for (i = 0; i < hw->queues; i++)
|
2008-12-18 22:35:20 +01:00
|
|
|
__ieee80211_wake_queue(hw, i, reason);
|
|
|
|
|
|
|
|
spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
|
|
|
|
}
|
|
|
|
|
|
|
|
void ieee80211_wake_queues(struct ieee80211_hw *hw)
|
|
|
|
{
|
|
|
|
ieee80211_wake_queues_by_reason(hw, IEEE80211_QUEUE_STOP_REASON_DRIVER);
|
2007-07-27 15:43:23 +02:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(ieee80211_wake_queues);
|
2007-11-09 01:57:29 +01:00
|
|
|
|
2007-12-19 01:31:26 +01:00
|
|
|
void ieee80211_iterate_active_interfaces(
|
|
|
|
struct ieee80211_hw *hw,
|
|
|
|
void (*iterator)(void *data, u8 *mac,
|
|
|
|
struct ieee80211_vif *vif),
|
|
|
|
void *data)
|
2007-11-09 01:57:29 +01:00
|
|
|
{
|
|
|
|
struct ieee80211_local *local = hw_to_local(hw);
|
|
|
|
struct ieee80211_sub_if_data *sdata;
|
|
|
|
|
2009-01-23 22:54:03 +01:00
|
|
|
mutex_lock(&local->iflist_mtx);
|
2008-05-10 13:40:49 +02:00
|
|
|
|
|
|
|
list_for_each_entry(sdata, &local->interfaces, list) {
|
|
|
|
switch (sdata->vif.type) {
|
2008-09-11 00:01:58 +02:00
|
|
|
case __NL80211_IFTYPE_AFTER_LAST:
|
|
|
|
case NL80211_IFTYPE_UNSPECIFIED:
|
|
|
|
case NL80211_IFTYPE_MONITOR:
|
|
|
|
case NL80211_IFTYPE_AP_VLAN:
|
2008-05-10 13:40:49 +02:00
|
|
|
continue;
|
2008-09-11 00:01:58 +02:00
|
|
|
case NL80211_IFTYPE_AP:
|
|
|
|
case NL80211_IFTYPE_STATION:
|
|
|
|
case NL80211_IFTYPE_ADHOC:
|
|
|
|
case NL80211_IFTYPE_WDS:
|
|
|
|
case NL80211_IFTYPE_MESH_POINT:
|
2008-05-10 13:40:49 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (netif_running(sdata->dev))
|
|
|
|
iterator(data, sdata->dev->dev_addr,
|
|
|
|
&sdata->vif);
|
|
|
|
}
|
|
|
|
|
2009-01-23 22:54:03 +01:00
|
|
|
mutex_unlock(&local->iflist_mtx);
|
2008-05-10 13:40:49 +02:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(ieee80211_iterate_active_interfaces);
|
|
|
|
|
|
|
|
void ieee80211_iterate_active_interfaces_atomic(
|
|
|
|
struct ieee80211_hw *hw,
|
|
|
|
void (*iterator)(void *data, u8 *mac,
|
|
|
|
struct ieee80211_vif *vif),
|
|
|
|
void *data)
|
|
|
|
{
|
|
|
|
struct ieee80211_local *local = hw_to_local(hw);
|
|
|
|
struct ieee80211_sub_if_data *sdata;
|
|
|
|
|
2007-11-28 10:55:32 +01:00
|
|
|
rcu_read_lock();
|
2007-11-09 01:57:29 +01:00
|
|
|
|
2007-11-28 10:55:32 +01:00
|
|
|
list_for_each_entry_rcu(sdata, &local->interfaces, list) {
|
2007-12-19 01:31:27 +01:00
|
|
|
switch (sdata->vif.type) {
|
2008-09-11 00:01:58 +02:00
|
|
|
case __NL80211_IFTYPE_AFTER_LAST:
|
|
|
|
case NL80211_IFTYPE_UNSPECIFIED:
|
|
|
|
case NL80211_IFTYPE_MONITOR:
|
|
|
|
case NL80211_IFTYPE_AP_VLAN:
|
2007-11-09 01:57:29 +01:00
|
|
|
continue;
|
2008-09-11 00:01:58 +02:00
|
|
|
case NL80211_IFTYPE_AP:
|
|
|
|
case NL80211_IFTYPE_STATION:
|
|
|
|
case NL80211_IFTYPE_ADHOC:
|
|
|
|
case NL80211_IFTYPE_WDS:
|
|
|
|
case NL80211_IFTYPE_MESH_POINT:
|
2007-11-09 01:57:29 +01:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (netif_running(sdata->dev))
|
|
|
|
iterator(data, sdata->dev->dev_addr,
|
2007-12-19 01:31:26 +01:00
|
|
|
&sdata->vif);
|
2007-11-09 01:57:29 +01:00
|
|
|
}
|
2007-11-28 10:55:32 +01:00
|
|
|
|
|
|
|
rcu_read_unlock();
|
2007-11-09 01:57:29 +01:00
|
|
|
}
|
2008-05-10 13:40:49 +02:00
|
|
|
EXPORT_SYMBOL_GPL(ieee80211_iterate_active_interfaces_atomic);
|
2008-09-08 16:40:36 +02:00
|
|
|
|
2009-07-30 02:08:07 +02:00
|
|
|
/*
|
|
|
|
* Nothing should have been stuffed into the workqueue during
|
|
|
|
* the suspend->resume cycle. If this WARN is seen then there
|
|
|
|
* is a bug with either the driver suspend or something in
|
|
|
|
* mac80211 stuffing into the workqueue which we haven't yet
|
|
|
|
* cleared during mac80211's suspend cycle.
|
|
|
|
*/
|
|
|
|
static bool ieee80211_can_queue_work(struct ieee80211_local *local)
|
|
|
|
{
|
|
|
|
if (WARN(local->suspended, "queueing ieee80211 work while "
|
|
|
|
"going to suspend\n"))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
void ieee80211_queue_work(struct ieee80211_hw *hw, struct work_struct *work)
|
|
|
|
{
|
|
|
|
struct ieee80211_local *local = hw_to_local(hw);
|
|
|
|
|
|
|
|
if (!ieee80211_can_queue_work(local))
|
|
|
|
return;
|
|
|
|
|
|
|
|
queue_work(local->workqueue, work);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(ieee80211_queue_work);
|
|
|
|
|
|
|
|
void ieee80211_queue_delayed_work(struct ieee80211_hw *hw,
|
|
|
|
struct delayed_work *dwork,
|
|
|
|
unsigned long delay)
|
|
|
|
{
|
|
|
|
struct ieee80211_local *local = hw_to_local(hw);
|
|
|
|
|
|
|
|
if (!ieee80211_can_queue_work(local))
|
|
|
|
return;
|
|
|
|
|
|
|
|
queue_delayed_work(local->workqueue, dwork, delay);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(ieee80211_queue_delayed_work);
|
|
|
|
|
2008-09-08 16:40:36 +02:00
|
|
|
void ieee802_11_parse_elems(u8 *start, size_t len,
|
|
|
|
struct ieee802_11_elems *elems)
|
mac80211: implement beacon filtering in software
Regardless of whether the hardware implements beacon filtering,
there's no need to process all beacons in software all the time
throughout the stack (mac80211 does a lot, then cfg80211, then
in the future possibly userspace).
This patch implements the "best possible" beacon filtering in
mac80211. "Best possible" means that it can look for changes in
all requested information elements, and distinguish vendor IEs
by their OUI.
In the future, we will add nl80211 API for userspace to request
information elements and vendor IE OUIs to watch -- drivers can
then implement the best they can do while software implements
it fully.
It is unclear whether or not this actually saves CPU time, but
the data is all in the cache already so it should be fairly
cheap. The additional _testing_, however, has great benefit;
Without this, and on hardware that doesn't implement beacon
filtering, wrong assumptions about, for example, scan result
updates could quickly creep into code.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-04-16 13:17:26 +02:00
|
|
|
{
|
|
|
|
ieee802_11_parse_elems_crc(start, len, elems, 0, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
u32 ieee802_11_parse_elems_crc(u8 *start, size_t len,
|
|
|
|
struct ieee802_11_elems *elems,
|
|
|
|
u64 filter, u32 crc)
|
2008-09-08 16:40:36 +02:00
|
|
|
{
|
|
|
|
size_t left = len;
|
|
|
|
u8 *pos = start;
|
mac80211: implement beacon filtering in software
Regardless of whether the hardware implements beacon filtering,
there's no need to process all beacons in software all the time
throughout the stack (mac80211 does a lot, then cfg80211, then
in the future possibly userspace).
This patch implements the "best possible" beacon filtering in
mac80211. "Best possible" means that it can look for changes in
all requested information elements, and distinguish vendor IEs
by their OUI.
In the future, we will add nl80211 API for userspace to request
information elements and vendor IE OUIs to watch -- drivers can
then implement the best they can do while software implements
it fully.
It is unclear whether or not this actually saves CPU time, but
the data is all in the cache already so it should be fairly
cheap. The additional _testing_, however, has great benefit;
Without this, and on hardware that doesn't implement beacon
filtering, wrong assumptions about, for example, scan result
updates could quickly creep into code.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-04-16 13:17:26 +02:00
|
|
|
bool calc_crc = filter != 0;
|
2008-09-08 16:40:36 +02:00
|
|
|
|
|
|
|
memset(elems, 0, sizeof(*elems));
|
|
|
|
elems->ie_start = start;
|
|
|
|
elems->total_len = len;
|
|
|
|
|
|
|
|
while (left >= 2) {
|
|
|
|
u8 id, elen;
|
|
|
|
|
|
|
|
id = *pos++;
|
|
|
|
elen = *pos++;
|
|
|
|
left -= 2;
|
|
|
|
|
|
|
|
if (elen > left)
|
mac80211: implement beacon filtering in software
Regardless of whether the hardware implements beacon filtering,
there's no need to process all beacons in software all the time
throughout the stack (mac80211 does a lot, then cfg80211, then
in the future possibly userspace).
This patch implements the "best possible" beacon filtering in
mac80211. "Best possible" means that it can look for changes in
all requested information elements, and distinguish vendor IEs
by their OUI.
In the future, we will add nl80211 API for userspace to request
information elements and vendor IE OUIs to watch -- drivers can
then implement the best they can do while software implements
it fully.
It is unclear whether or not this actually saves CPU time, but
the data is all in the cache already so it should be fairly
cheap. The additional _testing_, however, has great benefit;
Without this, and on hardware that doesn't implement beacon
filtering, wrong assumptions about, for example, scan result
updates could quickly creep into code.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-04-16 13:17:26 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
if (calc_crc && id < 64 && (filter & BIT(id)))
|
|
|
|
crc = crc32_be(crc, pos - 2, elen + 2);
|
2008-09-08 16:40:36 +02:00
|
|
|
|
|
|
|
switch (id) {
|
|
|
|
case WLAN_EID_SSID:
|
|
|
|
elems->ssid = pos;
|
|
|
|
elems->ssid_len = elen;
|
|
|
|
break;
|
|
|
|
case WLAN_EID_SUPP_RATES:
|
|
|
|
elems->supp_rates = pos;
|
|
|
|
elems->supp_rates_len = elen;
|
|
|
|
break;
|
|
|
|
case WLAN_EID_FH_PARAMS:
|
|
|
|
elems->fh_params = pos;
|
|
|
|
elems->fh_params_len = elen;
|
|
|
|
break;
|
|
|
|
case WLAN_EID_DS_PARAMS:
|
|
|
|
elems->ds_params = pos;
|
|
|
|
elems->ds_params_len = elen;
|
|
|
|
break;
|
|
|
|
case WLAN_EID_CF_PARAMS:
|
|
|
|
elems->cf_params = pos;
|
|
|
|
elems->cf_params_len = elen;
|
|
|
|
break;
|
|
|
|
case WLAN_EID_TIM:
|
2009-04-18 17:33:24 +02:00
|
|
|
if (elen >= sizeof(struct ieee80211_tim_ie)) {
|
|
|
|
elems->tim = (void *)pos;
|
|
|
|
elems->tim_len = elen;
|
|
|
|
}
|
2008-09-08 16:40:36 +02:00
|
|
|
break;
|
|
|
|
case WLAN_EID_IBSS_PARAMS:
|
|
|
|
elems->ibss_params = pos;
|
|
|
|
elems->ibss_params_len = elen;
|
|
|
|
break;
|
|
|
|
case WLAN_EID_CHALLENGE:
|
|
|
|
elems->challenge = pos;
|
|
|
|
elems->challenge_len = elen;
|
|
|
|
break;
|
mac80211: implement beacon filtering in software
Regardless of whether the hardware implements beacon filtering,
there's no need to process all beacons in software all the time
throughout the stack (mac80211 does a lot, then cfg80211, then
in the future possibly userspace).
This patch implements the "best possible" beacon filtering in
mac80211. "Best possible" means that it can look for changes in
all requested information elements, and distinguish vendor IEs
by their OUI.
In the future, we will add nl80211 API for userspace to request
information elements and vendor IE OUIs to watch -- drivers can
then implement the best they can do while software implements
it fully.
It is unclear whether or not this actually saves CPU time, but
the data is all in the cache already so it should be fairly
cheap. The additional _testing_, however, has great benefit;
Without this, and on hardware that doesn't implement beacon
filtering, wrong assumptions about, for example, scan result
updates could quickly creep into code.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-04-16 13:17:26 +02:00
|
|
|
case WLAN_EID_VENDOR_SPECIFIC:
|
2008-09-08 16:40:36 +02:00
|
|
|
if (elen >= 4 && pos[0] == 0x00 && pos[1] == 0x50 &&
|
|
|
|
pos[2] == 0xf2) {
|
|
|
|
/* Microsoft OUI (00:50:F2) */
|
mac80211: implement beacon filtering in software
Regardless of whether the hardware implements beacon filtering,
there's no need to process all beacons in software all the time
throughout the stack (mac80211 does a lot, then cfg80211, then
in the future possibly userspace).
This patch implements the "best possible" beacon filtering in
mac80211. "Best possible" means that it can look for changes in
all requested information elements, and distinguish vendor IEs
by their OUI.
In the future, we will add nl80211 API for userspace to request
information elements and vendor IE OUIs to watch -- drivers can
then implement the best they can do while software implements
it fully.
It is unclear whether or not this actually saves CPU time, but
the data is all in the cache already so it should be fairly
cheap. The additional _testing_, however, has great benefit;
Without this, and on hardware that doesn't implement beacon
filtering, wrong assumptions about, for example, scan result
updates could quickly creep into code.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-04-16 13:17:26 +02:00
|
|
|
|
|
|
|
if (calc_crc)
|
|
|
|
crc = crc32_be(crc, pos - 2, elen + 2);
|
|
|
|
|
2008-09-08 16:40:36 +02:00
|
|
|
if (pos[3] == 1) {
|
|
|
|
/* OUI Type 1 - WPA IE */
|
|
|
|
elems->wpa = pos;
|
|
|
|
elems->wpa_len = elen;
|
|
|
|
} else if (elen >= 5 && pos[3] == 2) {
|
mac80211: implement beacon filtering in software
Regardless of whether the hardware implements beacon filtering,
there's no need to process all beacons in software all the time
throughout the stack (mac80211 does a lot, then cfg80211, then
in the future possibly userspace).
This patch implements the "best possible" beacon filtering in
mac80211. "Best possible" means that it can look for changes in
all requested information elements, and distinguish vendor IEs
by their OUI.
In the future, we will add nl80211 API for userspace to request
information elements and vendor IE OUIs to watch -- drivers can
then implement the best they can do while software implements
it fully.
It is unclear whether or not this actually saves CPU time, but
the data is all in the cache already so it should be fairly
cheap. The additional _testing_, however, has great benefit;
Without this, and on hardware that doesn't implement beacon
filtering, wrong assumptions about, for example, scan result
updates could quickly creep into code.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-04-16 13:17:26 +02:00
|
|
|
/* OUI Type 2 - WMM IE */
|
2008-09-08 16:40:36 +02:00
|
|
|
if (pos[4] == 0) {
|
|
|
|
elems->wmm_info = pos;
|
|
|
|
elems->wmm_info_len = elen;
|
|
|
|
} else if (pos[4] == 1) {
|
|
|
|
elems->wmm_param = pos;
|
|
|
|
elems->wmm_param_len = elen;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case WLAN_EID_RSN:
|
|
|
|
elems->rsn = pos;
|
|
|
|
elems->rsn_len = elen;
|
|
|
|
break;
|
|
|
|
case WLAN_EID_ERP_INFO:
|
|
|
|
elems->erp_info = pos;
|
|
|
|
elems->erp_info_len = elen;
|
|
|
|
break;
|
|
|
|
case WLAN_EID_EXT_SUPP_RATES:
|
|
|
|
elems->ext_supp_rates = pos;
|
|
|
|
elems->ext_supp_rates_len = elen;
|
|
|
|
break;
|
|
|
|
case WLAN_EID_HT_CAPABILITY:
|
2008-10-07 19:31:17 +02:00
|
|
|
if (elen >= sizeof(struct ieee80211_ht_cap))
|
|
|
|
elems->ht_cap_elem = (void *)pos;
|
2008-09-08 16:40:36 +02:00
|
|
|
break;
|
2008-10-09 12:13:49 +02:00
|
|
|
case WLAN_EID_HT_INFORMATION:
|
|
|
|
if (elen >= sizeof(struct ieee80211_ht_info))
|
2008-10-07 19:31:17 +02:00
|
|
|
elems->ht_info_elem = (void *)pos;
|
2008-09-08 16:40:36 +02:00
|
|
|
break;
|
|
|
|
case WLAN_EID_MESH_ID:
|
|
|
|
elems->mesh_id = pos;
|
|
|
|
elems->mesh_id_len = elen;
|
|
|
|
break;
|
|
|
|
case WLAN_EID_MESH_CONFIG:
|
2009-11-18 19:40:00 +01:00
|
|
|
if (elen >= sizeof(struct ieee80211_meshconf_ie))
|
|
|
|
elems->mesh_config = (void *)pos;
|
2008-09-08 16:40:36 +02:00
|
|
|
break;
|
|
|
|
case WLAN_EID_PEER_LINK:
|
|
|
|
elems->peer_link = pos;
|
|
|
|
elems->peer_link_len = elen;
|
|
|
|
break;
|
|
|
|
case WLAN_EID_PREQ:
|
|
|
|
elems->preq = pos;
|
|
|
|
elems->preq_len = elen;
|
|
|
|
break;
|
|
|
|
case WLAN_EID_PREP:
|
|
|
|
elems->prep = pos;
|
|
|
|
elems->prep_len = elen;
|
|
|
|
break;
|
|
|
|
case WLAN_EID_PERR:
|
|
|
|
elems->perr = pos;
|
|
|
|
elems->perr_len = elen;
|
|
|
|
break;
|
2009-11-11 01:01:31 +01:00
|
|
|
case WLAN_EID_RANN:
|
|
|
|
if (elen >= sizeof(struct ieee80211_rann_ie))
|
|
|
|
elems->rann = (void *)pos;
|
|
|
|
break;
|
2008-09-08 16:40:36 +02:00
|
|
|
case WLAN_EID_CHANNEL_SWITCH:
|
|
|
|
elems->ch_switch_elem = pos;
|
|
|
|
elems->ch_switch_elem_len = elen;
|
|
|
|
break;
|
|
|
|
case WLAN_EID_QUIET:
|
|
|
|
if (!elems->quiet_elem) {
|
|
|
|
elems->quiet_elem = pos;
|
|
|
|
elems->quiet_elem_len = elen;
|
|
|
|
}
|
|
|
|
elems->num_of_quiet_elem++;
|
|
|
|
break;
|
|
|
|
case WLAN_EID_COUNTRY:
|
|
|
|
elems->country_elem = pos;
|
|
|
|
elems->country_elem_len = elen;
|
|
|
|
break;
|
|
|
|
case WLAN_EID_PWR_CONSTRAINT:
|
|
|
|
elems->pwr_constr_elem = pos;
|
|
|
|
elems->pwr_constr_elem_len = elen;
|
|
|
|
break;
|
2009-01-19 17:48:46 +01:00
|
|
|
case WLAN_EID_TIMEOUT_INTERVAL:
|
|
|
|
elems->timeout_int = pos;
|
|
|
|
elems->timeout_int_len = elen;
|
2009-01-08 12:32:09 +01:00
|
|
|
break;
|
2008-09-08 16:40:36 +02:00
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
left -= elen;
|
|
|
|
pos += elen;
|
|
|
|
}
|
mac80211: implement beacon filtering in software
Regardless of whether the hardware implements beacon filtering,
there's no need to process all beacons in software all the time
throughout the stack (mac80211 does a lot, then cfg80211, then
in the future possibly userspace).
This patch implements the "best possible" beacon filtering in
mac80211. "Best possible" means that it can look for changes in
all requested information elements, and distinguish vendor IEs
by their OUI.
In the future, we will add nl80211 API for userspace to request
information elements and vendor IE OUIs to watch -- drivers can
then implement the best they can do while software implements
it fully.
It is unclear whether or not this actually saves CPU time, but
the data is all in the cache already so it should be fairly
cheap. The additional _testing_, however, has great benefit;
Without this, and on hardware that doesn't implement beacon
filtering, wrong assumptions about, for example, scan result
updates could quickly creep into code.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-04-16 13:17:26 +02:00
|
|
|
|
|
|
|
return crc;
|
2008-09-08 16:40:36 +02:00
|
|
|
}
|
2008-09-09 12:56:01 +02:00
|
|
|
|
|
|
|
void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata)
|
|
|
|
{
|
|
|
|
struct ieee80211_local *local = sdata->local;
|
|
|
|
struct ieee80211_tx_queue_params qparam;
|
2009-05-07 16:16:24 +02:00
|
|
|
int queue;
|
|
|
|
bool use_11b;
|
|
|
|
int aCWmin, aCWmax;
|
2008-09-09 12:56:01 +02:00
|
|
|
|
|
|
|
if (!local->ops->conf_tx)
|
|
|
|
return;
|
|
|
|
|
|
|
|
memset(&qparam, 0, sizeof(qparam));
|
|
|
|
|
2009-05-07 16:16:24 +02:00
|
|
|
use_11b = (local->hw.conf.channel->band == IEEE80211_BAND_2GHZ) &&
|
|
|
|
!(sdata->flags & IEEE80211_SDATA_OPERATING_GMODE);
|
2008-09-09 12:56:01 +02:00
|
|
|
|
2009-05-07 16:16:24 +02:00
|
|
|
for (queue = 0; queue < local_to_hw(local)->queues; queue++) {
|
|
|
|
/* Set defaults according to 802.11-2007 Table 7-37 */
|
|
|
|
aCWmax = 1023;
|
|
|
|
if (use_11b)
|
|
|
|
aCWmin = 31;
|
|
|
|
else
|
|
|
|
aCWmin = 15;
|
|
|
|
|
|
|
|
switch (queue) {
|
|
|
|
case 3: /* AC_BK */
|
2009-05-27 09:41:06 +02:00
|
|
|
qparam.cw_max = aCWmax;
|
|
|
|
qparam.cw_min = aCWmin;
|
2009-05-07 16:16:24 +02:00
|
|
|
qparam.txop = 0;
|
|
|
|
qparam.aifs = 7;
|
|
|
|
break;
|
|
|
|
default: /* never happens but let's not leave undefined */
|
|
|
|
case 2: /* AC_BE */
|
2009-05-27 09:41:06 +02:00
|
|
|
qparam.cw_max = aCWmax;
|
|
|
|
qparam.cw_min = aCWmin;
|
2009-05-07 16:16:24 +02:00
|
|
|
qparam.txop = 0;
|
|
|
|
qparam.aifs = 3;
|
|
|
|
break;
|
|
|
|
case 1: /* AC_VI */
|
|
|
|
qparam.cw_max = aCWmin;
|
|
|
|
qparam.cw_min = (aCWmin + 1) / 2 - 1;
|
|
|
|
if (use_11b)
|
|
|
|
qparam.txop = 6016/32;
|
|
|
|
else
|
|
|
|
qparam.txop = 3008/32;
|
|
|
|
qparam.aifs = 2;
|
|
|
|
break;
|
|
|
|
case 0: /* AC_VO */
|
|
|
|
qparam.cw_max = (aCWmin + 1) / 2 - 1;
|
|
|
|
qparam.cw_min = (aCWmin + 1) / 4 - 1;
|
|
|
|
if (use_11b)
|
|
|
|
qparam.txop = 3264/32;
|
|
|
|
else
|
|
|
|
qparam.txop = 1504/32;
|
|
|
|
qparam.aifs = 2;
|
|
|
|
break;
|
|
|
|
}
|
2008-09-09 12:56:01 +02:00
|
|
|
|
2009-05-07 16:16:24 +02:00
|
|
|
drv_conf_tx(local, queue, &qparam);
|
|
|
|
}
|
2008-09-09 12:56:01 +02:00
|
|
|
}
|
2008-09-09 15:07:09 +02:00
|
|
|
|
2009-02-15 12:44:28 +01:00
|
|
|
void ieee80211_sta_def_wmm_params(struct ieee80211_sub_if_data *sdata,
|
|
|
|
const size_t supp_rates_len,
|
|
|
|
const u8 *supp_rates)
|
|
|
|
{
|
|
|
|
struct ieee80211_local *local = sdata->local;
|
|
|
|
int i, have_higher_than_11mbit = 0;
|
|
|
|
|
|
|
|
/* cf. IEEE 802.11 9.2.12 */
|
|
|
|
for (i = 0; i < supp_rates_len; i++)
|
|
|
|
if ((supp_rates[i] & 0x7f) * 5 > 110)
|
|
|
|
have_higher_than_11mbit = 1;
|
|
|
|
|
|
|
|
if (local->hw.conf.channel->band == IEEE80211_BAND_2GHZ &&
|
|
|
|
have_higher_than_11mbit)
|
|
|
|
sdata->flags |= IEEE80211_SDATA_OPERATING_GMODE;
|
|
|
|
else
|
|
|
|
sdata->flags &= ~IEEE80211_SDATA_OPERATING_GMODE;
|
|
|
|
|
|
|
|
ieee80211_set_wmm_default(sdata);
|
|
|
|
}
|
|
|
|
|
2009-01-21 15:13:48 +01:00
|
|
|
u32 ieee80211_mandatory_rates(struct ieee80211_local *local,
|
2008-09-11 00:01:57 +02:00
|
|
|
enum ieee80211_band band)
|
|
|
|
{
|
|
|
|
struct ieee80211_supported_band *sband;
|
|
|
|
struct ieee80211_rate *bitrates;
|
2009-01-21 15:13:48 +01:00
|
|
|
u32 mandatory_rates;
|
2008-09-11 00:01:57 +02:00
|
|
|
enum ieee80211_rate_flags mandatory_flag;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
sband = local->hw.wiphy->bands[band];
|
|
|
|
if (!sband) {
|
|
|
|
WARN_ON(1);
|
|
|
|
sband = local->hw.wiphy->bands[local->hw.conf.channel->band];
|
|
|
|
}
|
|
|
|
|
|
|
|
if (band == IEEE80211_BAND_2GHZ)
|
|
|
|
mandatory_flag = IEEE80211_RATE_MANDATORY_B;
|
|
|
|
else
|
|
|
|
mandatory_flag = IEEE80211_RATE_MANDATORY_A;
|
|
|
|
|
|
|
|
bitrates = sband->bitrates;
|
|
|
|
mandatory_rates = 0;
|
|
|
|
for (i = 0; i < sband->n_bitrates; i++)
|
|
|
|
if (bitrates[i].flags & mandatory_flag)
|
|
|
|
mandatory_rates |= BIT(i);
|
|
|
|
return mandatory_rates;
|
|
|
|
}
|
2009-02-15 12:44:28 +01:00
|
|
|
|
|
|
|
void ieee80211_send_auth(struct ieee80211_sub_if_data *sdata,
|
|
|
|
u16 transaction, u16 auth_alg,
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 14:22:54 +02:00
|
|
|
u8 *extra, size_t extra_len, const u8 *bssid,
|
|
|
|
const u8 *key, u8 key_len, u8 key_idx)
|
2009-02-15 12:44:28 +01:00
|
|
|
{
|
|
|
|
struct ieee80211_local *local = sdata->local;
|
|
|
|
struct sk_buff *skb;
|
|
|
|
struct ieee80211_mgmt *mgmt;
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 14:22:54 +02:00
|
|
|
int err;
|
2009-02-15 12:44:28 +01:00
|
|
|
|
|
|
|
skb = dev_alloc_skb(local->hw.extra_tx_headroom +
|
2009-03-20 20:21:16 +01:00
|
|
|
sizeof(*mgmt) + 6 + extra_len);
|
2009-02-15 12:44:28 +01:00
|
|
|
if (!skb) {
|
|
|
|
printk(KERN_DEBUG "%s: failed to allocate buffer for auth "
|
|
|
|
"frame\n", sdata->dev->name);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
skb_reserve(skb, local->hw.extra_tx_headroom);
|
|
|
|
|
|
|
|
mgmt = (struct ieee80211_mgmt *) skb_put(skb, 24 + 6);
|
|
|
|
memset(mgmt, 0, 24 + 6);
|
|
|
|
mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
|
|
|
|
IEEE80211_STYPE_AUTH);
|
|
|
|
memcpy(mgmt->da, bssid, ETH_ALEN);
|
|
|
|
memcpy(mgmt->sa, sdata->dev->dev_addr, ETH_ALEN);
|
|
|
|
memcpy(mgmt->bssid, bssid, ETH_ALEN);
|
|
|
|
mgmt->u.auth.auth_alg = cpu_to_le16(auth_alg);
|
|
|
|
mgmt->u.auth.auth_transaction = cpu_to_le16(transaction);
|
|
|
|
mgmt->u.auth.status_code = cpu_to_le16(0);
|
|
|
|
if (extra)
|
|
|
|
memcpy(skb_put(skb, extra_len), extra, extra_len);
|
|
|
|
|
cfg80211: rework key operation
This reworks the key operation in cfg80211, and now only
allows, from userspace, configuring keys (via nl80211)
after the connection has been established (in managed
mode), the IBSS been joined (in IBSS mode), at any time
(in AP[_VLAN] modes) or never for all the other modes.
In order to do shared key authentication correctly, it
is now possible to give a WEP key to the AUTH command.
To configure static WEP keys, these are given to the
CONNECT or IBSS_JOIN command directly, for a userspace
SME it is assumed it will configure it properly after
the connection has been established.
Since mac80211 used to check the default key in IBSS
mode to see whether or not the network is protected,
it needs an update in that area, as well as an update
to make use of the WEP key passed to auth() for shared
key authentication.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2009-07-08 14:22:54 +02:00
|
|
|
if (auth_alg == WLAN_AUTH_SHARED_KEY && transaction == 3) {
|
|
|
|
mgmt->frame_control |= cpu_to_le16(IEEE80211_FCTL_PROTECTED);
|
|
|
|
err = ieee80211_wep_encrypt(local, skb, key, key_len, key_idx);
|
|
|
|
WARN_ON(err);
|
|
|
|
}
|
|
|
|
|
2009-11-18 18:42:05 +01:00
|
|
|
IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;
|
|
|
|
ieee80211_tx_skb(sdata, skb);
|
2009-02-15 12:44:28 +01:00
|
|
|
}
|
|
|
|
|
2009-04-01 11:58:36 +02:00
|
|
|
int ieee80211_build_preq_ies(struct ieee80211_local *local, u8 *buffer,
|
2009-10-27 20:59:55 +01:00
|
|
|
const u8 *ie, size_t ie_len,
|
|
|
|
enum ieee80211_band band)
|
2009-04-01 11:58:36 +02:00
|
|
|
{
|
|
|
|
struct ieee80211_supported_band *sband;
|
|
|
|
u8 *pos, *supp_rates_len, *esupp_rates_len = NULL;
|
|
|
|
int i;
|
|
|
|
|
2009-10-27 20:59:55 +01:00
|
|
|
sband = local->hw.wiphy->bands[band];
|
2009-04-01 11:58:36 +02:00
|
|
|
|
|
|
|
pos = buffer;
|
|
|
|
|
|
|
|
*pos++ = WLAN_EID_SUPP_RATES;
|
|
|
|
supp_rates_len = pos;
|
|
|
|
*pos++ = 0;
|
|
|
|
|
|
|
|
for (i = 0; i < sband->n_bitrates; i++) {
|
|
|
|
struct ieee80211_rate *rate = &sband->bitrates[i];
|
|
|
|
|
|
|
|
if (esupp_rates_len) {
|
|
|
|
*esupp_rates_len += 1;
|
|
|
|
} else if (*supp_rates_len == 8) {
|
|
|
|
*pos++ = WLAN_EID_EXT_SUPP_RATES;
|
|
|
|
esupp_rates_len = pos;
|
|
|
|
*pos++ = 1;
|
|
|
|
} else
|
|
|
|
*supp_rates_len += 1;
|
|
|
|
|
|
|
|
*pos++ = rate->bitrate / 5;
|
|
|
|
}
|
|
|
|
|
2009-03-31 12:12:07 +02:00
|
|
|
if (sband->ht_cap.ht_supported) {
|
|
|
|
__le16 tmp = cpu_to_le16(sband->ht_cap.cap);
|
|
|
|
|
|
|
|
*pos++ = WLAN_EID_HT_CAPABILITY;
|
|
|
|
*pos++ = sizeof(struct ieee80211_ht_cap);
|
|
|
|
memset(pos, 0, sizeof(struct ieee80211_ht_cap));
|
|
|
|
memcpy(pos, &tmp, sizeof(u16));
|
|
|
|
pos += sizeof(u16);
|
|
|
|
/* TODO: needs a define here for << 2 */
|
|
|
|
*pos++ = sband->ht_cap.ampdu_factor |
|
|
|
|
(sband->ht_cap.ampdu_density << 2);
|
|
|
|
memcpy(pos, &sband->ht_cap.mcs, sizeof(sband->ht_cap.mcs));
|
|
|
|
pos += sizeof(sband->ht_cap.mcs);
|
|
|
|
pos += 2 + 4 + 1; /* ext info, BF cap, antsel */
|
|
|
|
}
|
|
|
|
|
2009-04-01 11:58:36 +02:00
|
|
|
/*
|
|
|
|
* If adding more here, adjust code in main.c
|
|
|
|
* that calculates local->scan_ies_len.
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (ie) {
|
|
|
|
memcpy(pos, ie, ie_len);
|
|
|
|
pos += ie_len;
|
|
|
|
}
|
|
|
|
|
|
|
|
return pos - buffer;
|
|
|
|
}
|
|
|
|
|
2009-02-15 12:44:28 +01:00
|
|
|
void ieee80211_send_probe_req(struct ieee80211_sub_if_data *sdata, u8 *dst,
|
2009-04-01 11:58:36 +02:00
|
|
|
const u8 *ssid, size_t ssid_len,
|
|
|
|
const u8 *ie, size_t ie_len)
|
2009-02-15 12:44:28 +01:00
|
|
|
{
|
|
|
|
struct ieee80211_local *local = sdata->local;
|
|
|
|
struct sk_buff *skb;
|
|
|
|
struct ieee80211_mgmt *mgmt;
|
2009-04-01 11:58:36 +02:00
|
|
|
u8 *pos;
|
2009-02-15 12:44:28 +01:00
|
|
|
|
|
|
|
skb = dev_alloc_skb(local->hw.extra_tx_headroom + sizeof(*mgmt) + 200 +
|
2009-03-20 20:21:16 +01:00
|
|
|
ie_len);
|
2009-02-15 12:44:28 +01:00
|
|
|
if (!skb) {
|
|
|
|
printk(KERN_DEBUG "%s: failed to allocate buffer for probe "
|
|
|
|
"request\n", sdata->dev->name);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
skb_reserve(skb, local->hw.extra_tx_headroom);
|
|
|
|
|
|
|
|
mgmt = (struct ieee80211_mgmt *) skb_put(skb, 24);
|
|
|
|
memset(mgmt, 0, 24);
|
|
|
|
mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
|
|
|
|
IEEE80211_STYPE_PROBE_REQ);
|
|
|
|
memcpy(mgmt->sa, sdata->dev->dev_addr, ETH_ALEN);
|
|
|
|
if (dst) {
|
|
|
|
memcpy(mgmt->da, dst, ETH_ALEN);
|
|
|
|
memcpy(mgmt->bssid, dst, ETH_ALEN);
|
|
|
|
} else {
|
|
|
|
memset(mgmt->da, 0xff, ETH_ALEN);
|
|
|
|
memset(mgmt->bssid, 0xff, ETH_ALEN);
|
|
|
|
}
|
|
|
|
pos = skb_put(skb, 2 + ssid_len);
|
|
|
|
*pos++ = WLAN_EID_SSID;
|
|
|
|
*pos++ = ssid_len;
|
|
|
|
memcpy(pos, ssid, ssid_len);
|
2009-04-01 11:58:36 +02:00
|
|
|
pos += ssid_len;
|
2009-02-15 12:44:28 +01:00
|
|
|
|
2009-10-27 20:59:55 +01:00
|
|
|
skb_put(skb, ieee80211_build_preq_ies(local, pos, ie, ie_len,
|
|
|
|
local->hw.conf.channel->band));
|
2009-02-15 12:44:28 +01:00
|
|
|
|
2009-11-18 18:42:05 +01:00
|
|
|
IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT;
|
|
|
|
ieee80211_tx_skb(sdata, skb);
|
2009-02-15 12:44:28 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
u32 ieee80211_sta_get_rates(struct ieee80211_local *local,
|
|
|
|
struct ieee802_11_elems *elems,
|
|
|
|
enum ieee80211_band band)
|
|
|
|
{
|
|
|
|
struct ieee80211_supported_band *sband;
|
|
|
|
struct ieee80211_rate *bitrates;
|
|
|
|
size_t num_rates;
|
|
|
|
u32 supp_rates;
|
|
|
|
int i, j;
|
|
|
|
sband = local->hw.wiphy->bands[band];
|
|
|
|
|
|
|
|
if (!sband) {
|
|
|
|
WARN_ON(1);
|
|
|
|
sband = local->hw.wiphy->bands[local->hw.conf.channel->band];
|
|
|
|
}
|
|
|
|
|
|
|
|
bitrates = sband->bitrates;
|
|
|
|
num_rates = sband->n_bitrates;
|
|
|
|
supp_rates = 0;
|
|
|
|
for (i = 0; i < elems->supp_rates_len +
|
|
|
|
elems->ext_supp_rates_len; i++) {
|
|
|
|
u8 rate = 0;
|
|
|
|
int own_rate;
|
|
|
|
if (i < elems->supp_rates_len)
|
|
|
|
rate = elems->supp_rates[i];
|
|
|
|
else if (elems->ext_supp_rates)
|
|
|
|
rate = elems->ext_supp_rates
|
|
|
|
[i - elems->supp_rates_len];
|
|
|
|
own_rate = 5 * (rate & 0x7f);
|
|
|
|
for (j = 0; j < num_rates; j++)
|
|
|
|
if (bitrates[j].bitrate == own_rate)
|
|
|
|
supp_rates |= BIT(j);
|
|
|
|
}
|
|
|
|
return supp_rates;
|
|
|
|
}
|
2009-04-14 10:09:24 +02:00
|
|
|
|
2009-08-20 20:02:20 +02:00
|
|
|
void ieee80211_stop_device(struct ieee80211_local *local)
|
|
|
|
{
|
|
|
|
ieee80211_led_radio(local, false);
|
|
|
|
|
|
|
|
cancel_work_sync(&local->reconfig_filter);
|
|
|
|
drv_stop(local);
|
|
|
|
|
|
|
|
flush_workqueue(local->workqueue);
|
|
|
|
}
|
|
|
|
|
2009-04-14 10:09:24 +02:00
|
|
|
int ieee80211_reconfig(struct ieee80211_local *local)
|
|
|
|
{
|
|
|
|
struct ieee80211_hw *hw = &local->hw;
|
|
|
|
struct ieee80211_sub_if_data *sdata;
|
|
|
|
struct ieee80211_if_init_conf conf;
|
|
|
|
struct sta_info *sta;
|
|
|
|
unsigned long flags;
|
|
|
|
int res;
|
2009-05-17 11:40:42 +02:00
|
|
|
bool from_suspend = local->suspended;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We're going to start the hardware, at that point
|
|
|
|
* we are no longer suspended and can RX frames.
|
|
|
|
*/
|
|
|
|
local->suspended = false;
|
2009-04-14 10:09:24 +02:00
|
|
|
|
|
|
|
/* restart hardware */
|
|
|
|
if (local->open_count) {
|
2009-04-23 18:52:52 +02:00
|
|
|
res = drv_start(local);
|
2009-04-14 10:09:24 +02:00
|
|
|
|
2009-06-02 13:01:41 +02:00
|
|
|
ieee80211_led_radio(local, true);
|
2009-04-14 10:09:24 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* add interfaces */
|
|
|
|
list_for_each_entry(sdata, &local->interfaces, list) {
|
|
|
|
if (sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
|
|
|
|
sdata->vif.type != NL80211_IFTYPE_MONITOR &&
|
|
|
|
netif_running(sdata->dev)) {
|
|
|
|
conf.vif = &sdata->vif;
|
|
|
|
conf.type = sdata->vif.type;
|
|
|
|
conf.mac_addr = sdata->dev->dev_addr;
|
2009-04-23 18:52:52 +02:00
|
|
|
res = drv_add_interface(local, &conf);
|
2009-04-14 10:09:24 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* add STAs back */
|
|
|
|
if (local->ops->sta_notify) {
|
|
|
|
spin_lock_irqsave(&local->sta_lock, flags);
|
|
|
|
list_for_each_entry(sta, &local->sta_list, list) {
|
2009-05-17 11:40:42 +02:00
|
|
|
sdata = sta->sdata;
|
2009-04-14 10:09:24 +02:00
|
|
|
if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
|
|
|
|
sdata = container_of(sdata->bss,
|
|
|
|
struct ieee80211_sub_if_data,
|
|
|
|
u.ap);
|
|
|
|
|
2009-04-23 18:52:52 +02:00
|
|
|
drv_sta_notify(local, &sdata->vif, STA_NOTIFY_ADD,
|
|
|
|
&sta->sta);
|
2009-04-14 10:09:24 +02:00
|
|
|
}
|
|
|
|
spin_unlock_irqrestore(&local->sta_lock, flags);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Clear Suspend state so that ADDBA requests can be processed */
|
|
|
|
|
|
|
|
rcu_read_lock();
|
|
|
|
|
|
|
|
if (hw->flags & IEEE80211_HW_AMPDU_AGGREGATION) {
|
|
|
|
list_for_each_entry_rcu(sta, &local->sta_list, list) {
|
|
|
|
clear_sta_flags(sta, WLAN_STA_SUSPEND);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
rcu_read_unlock();
|
|
|
|
|
|
|
|
/* setup RTS threshold */
|
2009-04-23 18:52:52 +02:00
|
|
|
drv_set_rts_threshold(local, hw->wiphy->rts_threshold);
|
2009-04-14 10:09:24 +02:00
|
|
|
|
|
|
|
/* reconfigure hardware */
|
|
|
|
ieee80211_hw_config(local, ~0);
|
|
|
|
|
|
|
|
ieee80211_configure_filter(local);
|
|
|
|
|
|
|
|
/* Finally also reconfigure all the BSS information */
|
|
|
|
list_for_each_entry(sdata, &local->interfaces, list) {
|
|
|
|
u32 changed = ~0;
|
|
|
|
if (!netif_running(sdata->dev))
|
|
|
|
continue;
|
|
|
|
switch (sdata->vif.type) {
|
|
|
|
case NL80211_IFTYPE_STATION:
|
|
|
|
/* disable beacon change bits */
|
2009-04-23 16:13:26 +02:00
|
|
|
changed &= ~(BSS_CHANGED_BEACON |
|
|
|
|
BSS_CHANGED_BEACON_ENABLED);
|
2009-04-14 10:09:24 +02:00
|
|
|
/* fall through */
|
|
|
|
case NL80211_IFTYPE_ADHOC:
|
|
|
|
case NL80211_IFTYPE_AP:
|
|
|
|
case NL80211_IFTYPE_MESH_POINT:
|
2009-04-23 16:13:26 +02:00
|
|
|
ieee80211_bss_info_change_notify(sdata, changed);
|
2009-04-14 10:09:24 +02:00
|
|
|
break;
|
|
|
|
case NL80211_IFTYPE_WDS:
|
|
|
|
break;
|
|
|
|
case NL80211_IFTYPE_AP_VLAN:
|
|
|
|
case NL80211_IFTYPE_MONITOR:
|
|
|
|
/* ignore virtual */
|
|
|
|
break;
|
|
|
|
case NL80211_IFTYPE_UNSPECIFIED:
|
|
|
|
case __NL80211_IFTYPE_AFTER_LAST:
|
|
|
|
WARN_ON(1);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* add back keys */
|
|
|
|
list_for_each_entry(sdata, &local->interfaces, list)
|
|
|
|
if (netif_running(sdata->dev))
|
|
|
|
ieee80211_enable_keys(sdata);
|
|
|
|
|
|
|
|
ieee80211_wake_queues_by_reason(hw,
|
|
|
|
IEEE80211_QUEUE_STOP_REASON_SUSPEND);
|
|
|
|
|
2009-05-17 11:40:42 +02:00
|
|
|
/*
|
|
|
|
* If this is for hw restart things are still running.
|
|
|
|
* We may want to change that later, however.
|
|
|
|
*/
|
|
|
|
if (!from_suspend)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
#ifdef CONFIG_PM
|
|
|
|
local->suspended = false;
|
|
|
|
|
|
|
|
list_for_each_entry(sdata, &local->interfaces, list) {
|
|
|
|
switch(sdata->vif.type) {
|
|
|
|
case NL80211_IFTYPE_STATION:
|
|
|
|
ieee80211_sta_restart(sdata);
|
|
|
|
break;
|
|
|
|
case NL80211_IFTYPE_ADHOC:
|
|
|
|
ieee80211_ibss_restart(sdata);
|
|
|
|
break;
|
|
|
|
case NL80211_IFTYPE_MESH_POINT:
|
|
|
|
ieee80211_mesh_restart(sdata);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
add_timer(&local->sta_cleanup);
|
|
|
|
|
|
|
|
spin_lock_irqsave(&local->sta_lock, flags);
|
|
|
|
list_for_each_entry(sta, &local->sta_list, list)
|
|
|
|
mesh_plink_restart(sta);
|
|
|
|
spin_unlock_irqrestore(&local->sta_lock, flags);
|
|
|
|
#else
|
|
|
|
WARN_ON(1);
|
|
|
|
#endif
|
2009-04-14 10:09:24 +02:00
|
|
|
return 0;
|
|
|
|
}
|
2009-07-30 02:08:07 +02:00
|
|
|
|