2007-09-26 02:57:13 +02:00
|
|
|
/*
|
2008-02-03 15:42:53 +01:00
|
|
|
Copyright (C) 2004 - 2008 rt2x00 SourceForge Project
|
2007-09-26 02:57:13 +02:00
|
|
|
<http://rt2x00.serialmonkey.com>
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program; if not, write to the
|
|
|
|
Free Software Foundation, Inc.,
|
|
|
|
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
Module: rt2x00lib
|
|
|
|
Abstract: rt2x00 generic device routines.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/module.h>
|
|
|
|
|
|
|
|
#include "rt2x00.h"
|
|
|
|
#include "rt2x00lib.h"
|
2007-11-27 21:49:29 +01:00
|
|
|
#include "rt2x00dump.h"
|
2007-09-26 02:57:13 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Link tuning handlers
|
|
|
|
*/
|
2008-02-25 23:15:13 +01:00
|
|
|
void rt2x00lib_reset_link_tuner(struct rt2x00_dev *rt2x00dev)
|
2007-09-26 02:57:13 +02:00
|
|
|
{
|
2008-02-25 23:15:13 +01:00
|
|
|
if (!test_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags))
|
|
|
|
return;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Reset link information.
|
|
|
|
* Both the currently active vgc level as well as
|
|
|
|
* the link tuner counter should be reset. Resetting
|
|
|
|
* the counter is important for devices where the
|
|
|
|
* device should only perform link tuning during the
|
|
|
|
* first minute after being enabled.
|
|
|
|
*/
|
2007-10-13 16:26:32 +02:00
|
|
|
rt2x00dev->link.count = 0;
|
|
|
|
rt2x00dev->link.vgc_level = 0;
|
|
|
|
|
2008-02-25 23:15:13 +01:00
|
|
|
/*
|
|
|
|
* Reset the link tuner.
|
|
|
|
*/
|
|
|
|
rt2x00dev->ops->lib->reset_tuner(rt2x00dev);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void rt2x00lib_start_link_tuner(struct rt2x00_dev *rt2x00dev)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* Clear all (possibly) pre-existing quality statistics.
|
|
|
|
*/
|
2007-10-13 16:26:32 +02:00
|
|
|
memset(&rt2x00dev->link.qual, 0, sizeof(rt2x00dev->link.qual));
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The RX and TX percentage should start at 50%
|
|
|
|
* this will assure we will get at least get some
|
|
|
|
* decent value when the link tuner starts.
|
|
|
|
* The value will be dropped and overwritten with
|
|
|
|
* the correct (measured )value anyway during the
|
|
|
|
* first run of the link tuner.
|
|
|
|
*/
|
|
|
|
rt2x00dev->link.qual.rx_percentage = 50;
|
|
|
|
rt2x00dev->link.qual.tx_percentage = 50;
|
2007-09-26 02:57:13 +02:00
|
|
|
|
2008-02-25 23:15:13 +01:00
|
|
|
rt2x00lib_reset_link_tuner(rt2x00dev);
|
2007-09-26 02:57:13 +02:00
|
|
|
|
|
|
|
queue_delayed_work(rt2x00dev->hw->workqueue,
|
|
|
|
&rt2x00dev->link.work, LINK_TUNE_INTERVAL);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void rt2x00lib_stop_link_tuner(struct rt2x00_dev *rt2x00dev)
|
|
|
|
{
|
2007-09-25 20:56:36 +02:00
|
|
|
cancel_delayed_work_sync(&rt2x00dev->link.work);
|
2007-09-26 02:57:13 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Radio control handlers.
|
|
|
|
*/
|
|
|
|
int rt2x00lib_enable_radio(struct rt2x00_dev *rt2x00dev)
|
|
|
|
{
|
|
|
|
int status;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Don't enable the radio twice.
|
|
|
|
* And check if the hardware button has been disabled.
|
|
|
|
*/
|
|
|
|
if (test_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags) ||
|
2007-10-06 14:14:06 +02:00
|
|
|
test_bit(DEVICE_DISABLED_RADIO_HW, &rt2x00dev->flags))
|
2007-09-26 02:57:13 +02:00
|
|
|
return 0;
|
|
|
|
|
2008-01-06 23:41:45 +01:00
|
|
|
/*
|
2008-02-05 22:42:23 +01:00
|
|
|
* Initialize all data queues.
|
2008-01-06 23:41:45 +01:00
|
|
|
*/
|
2008-02-05 22:42:23 +01:00
|
|
|
rt2x00queue_init_rx(rt2x00dev);
|
|
|
|
rt2x00queue_init_tx(rt2x00dev);
|
2008-01-06 23:41:45 +01:00
|
|
|
|
2007-09-26 02:57:13 +02:00
|
|
|
/*
|
|
|
|
* Enable radio.
|
|
|
|
*/
|
2008-03-31 15:53:44 +02:00
|
|
|
status =
|
|
|
|
rt2x00dev->ops->lib->set_device_state(rt2x00dev, STATE_RADIO_ON);
|
2007-09-26 02:57:13 +02:00
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
|
2008-03-31 15:53:44 +02:00
|
|
|
rt2x00leds_led_radio(rt2x00dev, true);
|
2008-04-21 19:01:09 +02:00
|
|
|
rt2x00led_led_activity(rt2x00dev, true);
|
2008-03-31 15:53:44 +02:00
|
|
|
|
2007-09-26 02:57:13 +02:00
|
|
|
__set_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Enable RX.
|
|
|
|
*/
|
2007-10-06 14:16:09 +02:00
|
|
|
rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_ON);
|
2007-09-26 02:57:13 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Start the TX queues.
|
|
|
|
*/
|
|
|
|
ieee80211_start_queues(rt2x00dev->hw);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void rt2x00lib_disable_radio(struct rt2x00_dev *rt2x00dev)
|
|
|
|
{
|
|
|
|
if (!__test_and_clear_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags))
|
|
|
|
return;
|
|
|
|
|
|
|
|
/*
|
[PATCH] mac80211: revamp interface and filter configuration
Drivers are currently supposed to keep track of monitor
interfaces if they allow so-called "hard" monitor, and
they are also supposed to keep track of multicast etc.
This patch changes that, replaces the set_multicast_list()
callback with a new configure_filter() callback that takes
filter flags (FIF_*) instead of interface flags (IFF_*).
For a driver, this means it should open the filter as much
as necessary to get all frames requested by the filter flags.
Accordingly, the filter flags are named "positively", e.g.
FIF_ALLMULTI.
Multicast filtering is a bit special in that drivers that
have no multicast address filters need to allow multicast
frames through when either the FIF_ALLMULTI flag is set or
when the mc_count value is positive.
At the same time, drivers are no longer notified about
monitor interfaces at all, this means they now need to
implement the start() and stop() callbacks and the new
change_filter_flags() callback. Also, the start()/stop()
ordering changed, start() is now called *before* any
add_interface() as it really should be, and stop() after
any remove_interface().
The patch also changes the behaviour of setting the bssid
to multicast for scanning when IEEE80211_HW_NO_PROBE_FILTERING
is set; the IEEE80211_HW_NO_PROBE_FILTERING flag is removed
and the filter flag FIF_BCN_PRBRESP_PROMISC introduced.
This is a lot more efficient for hardware like b43 that
supports it and other hardware can still set the BSSID
to all-ones.
Driver modifications by Johannes Berg (b43 & iwlwifi), Michael Wu
(rtl8187, adm8211, and p54), Larry Finger (b43legacy), and
Ivo van Doorn (rt2x00).
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Michael Wu <flamingice@sourmilk.net>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2007-09-17 07:29:23 +02:00
|
|
|
* Stop all scheduled work.
|
2007-09-26 02:57:13 +02:00
|
|
|
*/
|
rt2x00: Add per-interface structure
Rework the interface handling. Delete the interface structure
and replace it with a per-interface structure. This changes the
way rt2x00 handles the active interface drastically.
Copy ieee80211_bss_conf to the this rt2x00_intf structure during
the bss_info_changed() callback function. This will allow us to
reference it later, and removes the requirement for the device flag
SHORT_PREAMBLE flag which is interface specific.
Drivers receive the option to give the maximum number of virtual
interfaces the device can handle. Virtual interface support:
rt2400pci: 1 sta or 1 ap, * monitor interfaces
rt2500pci: 1 sta or 1 ap, * monitor interfaces
rt2500usb: 1 sta or 1 ap, * monitor interfaces
rt61pci: 1 sta or 4 ap, * monitor interfaces
rt73usb: 1 sta or 4 ap, * monitor interfaces
At the moment none of the drivers support AP and STA interfaces
simultaneously, this is a hardware limitation so future support
will be very unlikely.
Each interface structure receives its dedicated beacon entry,
with this we can easily work with beaconing while multiple master
mode interfaces are currently active.
The configuration handlers for the MAC, BSSID and type are
often called together since they all belong to the interface
configuration. Merge the 3 configuration calls and cleanup
the API between rt2x00lib and the drivers. While we are cleaning
up the interface configuration anyway, we might as well clean up
the configuration handler as well.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2008-02-03 15:49:59 +01:00
|
|
|
if (work_pending(&rt2x00dev->intf_work))
|
|
|
|
cancel_work_sync(&rt2x00dev->intf_work);
|
[PATCH] mac80211: revamp interface and filter configuration
Drivers are currently supposed to keep track of monitor
interfaces if they allow so-called "hard" monitor, and
they are also supposed to keep track of multicast etc.
This patch changes that, replaces the set_multicast_list()
callback with a new configure_filter() callback that takes
filter flags (FIF_*) instead of interface flags (IFF_*).
For a driver, this means it should open the filter as much
as necessary to get all frames requested by the filter flags.
Accordingly, the filter flags are named "positively", e.g.
FIF_ALLMULTI.
Multicast filtering is a bit special in that drivers that
have no multicast address filters need to allow multicast
frames through when either the FIF_ALLMULTI flag is set or
when the mc_count value is positive.
At the same time, drivers are no longer notified about
monitor interfaces at all, this means they now need to
implement the start() and stop() callbacks and the new
change_filter_flags() callback. Also, the start()/stop()
ordering changed, start() is now called *before* any
add_interface() as it really should be, and stop() after
any remove_interface().
The patch also changes the behaviour of setting the bssid
to multicast for scanning when IEEE80211_HW_NO_PROBE_FILTERING
is set; the IEEE80211_HW_NO_PROBE_FILTERING flag is removed
and the filter flag FIF_BCN_PRBRESP_PROMISC introduced.
This is a lot more efficient for hardware like b43 that
supports it and other hardware can still set the BSSID
to all-ones.
Driver modifications by Johannes Berg (b43 & iwlwifi), Michael Wu
(rtl8187, adm8211, and p54), Larry Finger (b43legacy), and
Ivo van Doorn (rt2x00).
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Michael Wu <flamingice@sourmilk.net>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2007-09-17 07:29:23 +02:00
|
|
|
if (work_pending(&rt2x00dev->filter_work))
|
|
|
|
cancel_work_sync(&rt2x00dev->filter_work);
|
2007-09-26 02:57:13 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Stop the TX queues.
|
|
|
|
*/
|
|
|
|
ieee80211_stop_queues(rt2x00dev->hw);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Disable RX.
|
|
|
|
*/
|
2007-10-06 14:16:09 +02:00
|
|
|
rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_OFF);
|
2007-09-26 02:57:13 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Disable radio.
|
|
|
|
*/
|
|
|
|
rt2x00dev->ops->lib->set_device_state(rt2x00dev, STATE_RADIO_OFF);
|
2008-04-21 19:01:09 +02:00
|
|
|
rt2x00led_led_activity(rt2x00dev, false);
|
2008-03-31 15:53:44 +02:00
|
|
|
rt2x00leds_led_radio(rt2x00dev, false);
|
2007-09-26 02:57:13 +02:00
|
|
|
}
|
|
|
|
|
2007-10-06 14:16:09 +02:00
|
|
|
void rt2x00lib_toggle_rx(struct rt2x00_dev *rt2x00dev, enum dev_state state)
|
2007-09-26 02:57:13 +02:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
* When we are disabling the RX, we should also stop the link tuner.
|
|
|
|
*/
|
2007-10-06 14:16:09 +02:00
|
|
|
if (state == STATE_RADIO_RX_OFF)
|
2007-09-26 02:57:13 +02:00
|
|
|
rt2x00lib_stop_link_tuner(rt2x00dev);
|
|
|
|
|
|
|
|
rt2x00dev->ops->lib->set_device_state(rt2x00dev, state);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* When we are enabling the RX, we should also start the link tuner.
|
|
|
|
*/
|
2007-10-06 14:16:09 +02:00
|
|
|
if (state == STATE_RADIO_RX_ON &&
|
rt2x00: Add per-interface structure
Rework the interface handling. Delete the interface structure
and replace it with a per-interface structure. This changes the
way rt2x00 handles the active interface drastically.
Copy ieee80211_bss_conf to the this rt2x00_intf structure during
the bss_info_changed() callback function. This will allow us to
reference it later, and removes the requirement for the device flag
SHORT_PREAMBLE flag which is interface specific.
Drivers receive the option to give the maximum number of virtual
interfaces the device can handle. Virtual interface support:
rt2400pci: 1 sta or 1 ap, * monitor interfaces
rt2500pci: 1 sta or 1 ap, * monitor interfaces
rt2500usb: 1 sta or 1 ap, * monitor interfaces
rt61pci: 1 sta or 4 ap, * monitor interfaces
rt73usb: 1 sta or 4 ap, * monitor interfaces
At the moment none of the drivers support AP and STA interfaces
simultaneously, this is a hardware limitation so future support
will be very unlikely.
Each interface structure receives its dedicated beacon entry,
with this we can easily work with beaconing while multiple master
mode interfaces are currently active.
The configuration handlers for the MAC, BSSID and type are
often called together since they all belong to the interface
configuration. Merge the 3 configuration calls and cleanup
the API between rt2x00lib and the drivers. While we are cleaning
up the interface configuration anyway, we might as well clean up
the configuration handler as well.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2008-02-03 15:49:59 +01:00
|
|
|
(rt2x00dev->intf_ap_count || rt2x00dev->intf_sta_count))
|
2007-09-26 02:57:13 +02:00
|
|
|
rt2x00lib_start_link_tuner(rt2x00dev);
|
|
|
|
}
|
|
|
|
|
2007-10-13 16:26:36 +02:00
|
|
|
static void rt2x00lib_evaluate_antenna_sample(struct rt2x00_dev *rt2x00dev)
|
|
|
|
{
|
|
|
|
enum antenna rx = rt2x00dev->link.ant.active.rx;
|
|
|
|
enum antenna tx = rt2x00dev->link.ant.active.tx;
|
|
|
|
int sample_a =
|
|
|
|
rt2x00_get_link_ant_rssi_history(&rt2x00dev->link, ANTENNA_A);
|
|
|
|
int sample_b =
|
|
|
|
rt2x00_get_link_ant_rssi_history(&rt2x00dev->link, ANTENNA_B);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We are done sampling. Now we should evaluate the results.
|
|
|
|
*/
|
|
|
|
rt2x00dev->link.ant.flags &= ~ANTENNA_MODE_SAMPLE;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* During the last period we have sampled the RSSI
|
|
|
|
* from both antenna's. It now is time to determine
|
|
|
|
* which antenna demonstrated the best performance.
|
|
|
|
* When we are already on the antenna with the best
|
|
|
|
* performance, then there really is nothing for us
|
|
|
|
* left to do.
|
|
|
|
*/
|
|
|
|
if (sample_a == sample_b)
|
|
|
|
return;
|
|
|
|
|
2008-02-25 23:15:08 +01:00
|
|
|
if (rt2x00dev->link.ant.flags & ANTENNA_RX_DIVERSITY)
|
|
|
|
rx = (sample_a > sample_b) ? ANTENNA_A : ANTENNA_B;
|
2007-10-13 16:26:36 +02:00
|
|
|
|
2008-02-25 23:15:08 +01:00
|
|
|
if (rt2x00dev->link.ant.flags & ANTENNA_TX_DIVERSITY)
|
|
|
|
tx = (sample_a > sample_b) ? ANTENNA_A : ANTENNA_B;
|
2007-10-13 16:26:36 +02:00
|
|
|
|
|
|
|
rt2x00lib_config_antenna(rt2x00dev, rx, tx);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void rt2x00lib_evaluate_antenna_eval(struct rt2x00_dev *rt2x00dev)
|
|
|
|
{
|
|
|
|
enum antenna rx = rt2x00dev->link.ant.active.rx;
|
|
|
|
enum antenna tx = rt2x00dev->link.ant.active.tx;
|
|
|
|
int rssi_curr = rt2x00_get_link_ant_rssi(&rt2x00dev->link);
|
|
|
|
int rssi_old = rt2x00_update_ant_rssi(&rt2x00dev->link, rssi_curr);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Legacy driver indicates that we should swap antenna's
|
|
|
|
* when the difference in RSSI is greater that 5. This
|
|
|
|
* also should be done when the RSSI was actually better
|
|
|
|
* then the previous sample.
|
|
|
|
* When the difference exceeds the threshold we should
|
|
|
|
* sample the rssi from the other antenna to make a valid
|
|
|
|
* comparison between the 2 antennas.
|
|
|
|
*/
|
2008-02-25 23:15:01 +01:00
|
|
|
if (abs(rssi_curr - rssi_old) < 5)
|
2007-10-13 16:26:36 +02:00
|
|
|
return;
|
|
|
|
|
|
|
|
rt2x00dev->link.ant.flags |= ANTENNA_MODE_SAMPLE;
|
|
|
|
|
|
|
|
if (rt2x00dev->link.ant.flags & ANTENNA_RX_DIVERSITY)
|
|
|
|
rx = (rx == ANTENNA_A) ? ANTENNA_B : ANTENNA_A;
|
|
|
|
|
|
|
|
if (rt2x00dev->link.ant.flags & ANTENNA_TX_DIVERSITY)
|
|
|
|
tx = (tx == ANTENNA_A) ? ANTENNA_B : ANTENNA_A;
|
|
|
|
|
|
|
|
rt2x00lib_config_antenna(rt2x00dev, rx, tx);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void rt2x00lib_evaluate_antenna(struct rt2x00_dev *rt2x00dev)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* Determine if software diversity is enabled for
|
|
|
|
* either the TX or RX antenna (or both).
|
|
|
|
* Always perform this check since within the link
|
|
|
|
* tuner interval the configuration might have changed.
|
|
|
|
*/
|
|
|
|
rt2x00dev->link.ant.flags &= ~ANTENNA_RX_DIVERSITY;
|
|
|
|
rt2x00dev->link.ant.flags &= ~ANTENNA_TX_DIVERSITY;
|
|
|
|
|
|
|
|
if (rt2x00dev->hw->conf.antenna_sel_rx == 0 &&
|
2008-02-25 23:15:01 +01:00
|
|
|
rt2x00dev->default_ant.rx == ANTENNA_SW_DIVERSITY)
|
2007-10-13 16:26:36 +02:00
|
|
|
rt2x00dev->link.ant.flags |= ANTENNA_RX_DIVERSITY;
|
|
|
|
if (rt2x00dev->hw->conf.antenna_sel_tx == 0 &&
|
2008-02-25 23:15:01 +01:00
|
|
|
rt2x00dev->default_ant.tx == ANTENNA_SW_DIVERSITY)
|
2007-10-13 16:26:36 +02:00
|
|
|
rt2x00dev->link.ant.flags |= ANTENNA_TX_DIVERSITY;
|
|
|
|
|
|
|
|
if (!(rt2x00dev->link.ant.flags & ANTENNA_RX_DIVERSITY) &&
|
|
|
|
!(rt2x00dev->link.ant.flags & ANTENNA_TX_DIVERSITY)) {
|
2008-02-25 23:15:08 +01:00
|
|
|
rt2x00dev->link.ant.flags = 0;
|
2007-10-13 16:26:36 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If we have only sampled the data over the last period
|
|
|
|
* we should now harvest the data. Otherwise just evaluate
|
|
|
|
* the data. The latter should only be performed once
|
|
|
|
* every 2 seconds.
|
|
|
|
*/
|
|
|
|
if (rt2x00dev->link.ant.flags & ANTENNA_MODE_SAMPLE)
|
|
|
|
rt2x00lib_evaluate_antenna_sample(rt2x00dev);
|
|
|
|
else if (rt2x00dev->link.count & 1)
|
|
|
|
rt2x00lib_evaluate_antenna_eval(rt2x00dev);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void rt2x00lib_update_link_stats(struct link *link, int rssi)
|
|
|
|
{
|
|
|
|
int avg_rssi = rssi;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Update global RSSI
|
|
|
|
*/
|
|
|
|
if (link->qual.avg_rssi)
|
|
|
|
avg_rssi = MOVING_AVERAGE(link->qual.avg_rssi, rssi, 8);
|
|
|
|
link->qual.avg_rssi = avg_rssi;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Update antenna RSSI
|
|
|
|
*/
|
|
|
|
if (link->ant.rssi_ant)
|
|
|
|
rssi = MOVING_AVERAGE(link->ant.rssi_ant, rssi, 8);
|
|
|
|
link->ant.rssi_ant = rssi;
|
|
|
|
}
|
|
|
|
|
2007-10-13 16:26:12 +02:00
|
|
|
static void rt2x00lib_precalculate_link_signal(struct link_qual *qual)
|
2007-09-26 02:57:13 +02:00
|
|
|
{
|
2007-10-13 16:26:12 +02:00
|
|
|
if (qual->rx_failed || qual->rx_success)
|
|
|
|
qual->rx_percentage =
|
|
|
|
(qual->rx_success * 100) /
|
|
|
|
(qual->rx_failed + qual->rx_success);
|
2007-09-26 02:57:13 +02:00
|
|
|
else
|
2007-10-13 16:26:12 +02:00
|
|
|
qual->rx_percentage = 50;
|
2007-09-26 02:57:13 +02:00
|
|
|
|
2007-10-13 16:26:12 +02:00
|
|
|
if (qual->tx_failed || qual->tx_success)
|
|
|
|
qual->tx_percentage =
|
|
|
|
(qual->tx_success * 100) /
|
|
|
|
(qual->tx_failed + qual->tx_success);
|
2007-09-26 02:57:13 +02:00
|
|
|
else
|
2007-10-13 16:26:12 +02:00
|
|
|
qual->tx_percentage = 50;
|
2007-09-26 02:57:13 +02:00
|
|
|
|
2007-10-13 16:26:12 +02:00
|
|
|
qual->rx_success = 0;
|
|
|
|
qual->rx_failed = 0;
|
|
|
|
qual->tx_success = 0;
|
|
|
|
qual->tx_failed = 0;
|
2007-09-26 02:57:13 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static int rt2x00lib_calculate_link_signal(struct rt2x00_dev *rt2x00dev,
|
|
|
|
int rssi)
|
|
|
|
{
|
|
|
|
int rssi_percentage = 0;
|
|
|
|
int signal;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We need a positive value for the RSSI.
|
|
|
|
*/
|
|
|
|
if (rssi < 0)
|
|
|
|
rssi += rt2x00dev->rssi_offset;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Calculate the different percentages,
|
|
|
|
* which will be used for the signal.
|
|
|
|
*/
|
|
|
|
if (rt2x00dev->rssi_offset)
|
|
|
|
rssi_percentage = (rssi * 100) / rt2x00dev->rssi_offset;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Add the individual percentages and use the WEIGHT
|
|
|
|
* defines to calculate the current link signal.
|
|
|
|
*/
|
|
|
|
signal = ((WEIGHT_RSSI * rssi_percentage) +
|
2007-10-13 16:26:12 +02:00
|
|
|
(WEIGHT_TX * rt2x00dev->link.qual.tx_percentage) +
|
|
|
|
(WEIGHT_RX * rt2x00dev->link.qual.rx_percentage)) / 100;
|
2007-09-26 02:57:13 +02:00
|
|
|
|
|
|
|
return (signal > 100) ? 100 : signal;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void rt2x00lib_link_tuner(struct work_struct *work)
|
|
|
|
{
|
|
|
|
struct rt2x00_dev *rt2x00dev =
|
|
|
|
container_of(work, struct rt2x00_dev, link.work.work);
|
|
|
|
|
2007-09-25 20:57:04 +02:00
|
|
|
/*
|
|
|
|
* When the radio is shutting down we should
|
|
|
|
* immediately cease all link tuning.
|
|
|
|
*/
|
|
|
|
if (!test_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags))
|
|
|
|
return;
|
|
|
|
|
2007-09-26 02:57:13 +02:00
|
|
|
/*
|
|
|
|
* Update statistics.
|
|
|
|
*/
|
2007-10-13 16:26:12 +02:00
|
|
|
rt2x00dev->ops->lib->link_stats(rt2x00dev, &rt2x00dev->link.qual);
|
2007-09-26 02:57:13 +02:00
|
|
|
rt2x00dev->low_level_stats.dot11FCSErrorCount +=
|
2007-10-13 16:26:12 +02:00
|
|
|
rt2x00dev->link.qual.rx_failed;
|
2007-09-26 02:57:13 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Only perform the link tuning when Link tuning
|
|
|
|
* has been enabled (This could have been disabled from the EEPROM).
|
|
|
|
*/
|
|
|
|
if (!test_bit(CONFIG_DISABLE_LINK_TUNING, &rt2x00dev->flags))
|
|
|
|
rt2x00dev->ops->lib->link_tuner(rt2x00dev);
|
|
|
|
|
2007-09-25 20:53:20 +02:00
|
|
|
/*
|
|
|
|
* Precalculate a portion of the link signal which is
|
|
|
|
* in based on the tx/rx success/failure counters.
|
|
|
|
*/
|
2007-10-13 16:26:12 +02:00
|
|
|
rt2x00lib_precalculate_link_signal(&rt2x00dev->link.qual);
|
2007-09-25 20:53:20 +02:00
|
|
|
|
2008-02-03 15:53:40 +01:00
|
|
|
/*
|
|
|
|
* Send a signal to the led to update the led signal strength.
|
|
|
|
*/
|
|
|
|
rt2x00leds_led_quality(rt2x00dev, rt2x00dev->link.qual.avg_rssi);
|
|
|
|
|
2008-02-25 23:15:13 +01:00
|
|
|
/*
|
|
|
|
* Evaluate antenna setup, make this the last step since this could
|
|
|
|
* possibly reset some statistics.
|
|
|
|
*/
|
|
|
|
rt2x00lib_evaluate_antenna(rt2x00dev);
|
|
|
|
|
2007-09-26 02:57:13 +02:00
|
|
|
/*
|
|
|
|
* Increase tuner counter, and reschedule the next link tuner run.
|
|
|
|
*/
|
|
|
|
rt2x00dev->link.count++;
|
|
|
|
queue_delayed_work(rt2x00dev->hw->workqueue, &rt2x00dev->link.work,
|
|
|
|
LINK_TUNE_INTERVAL);
|
|
|
|
}
|
|
|
|
|
[PATCH] mac80211: revamp interface and filter configuration
Drivers are currently supposed to keep track of monitor
interfaces if they allow so-called "hard" monitor, and
they are also supposed to keep track of multicast etc.
This patch changes that, replaces the set_multicast_list()
callback with a new configure_filter() callback that takes
filter flags (FIF_*) instead of interface flags (IFF_*).
For a driver, this means it should open the filter as much
as necessary to get all frames requested by the filter flags.
Accordingly, the filter flags are named "positively", e.g.
FIF_ALLMULTI.
Multicast filtering is a bit special in that drivers that
have no multicast address filters need to allow multicast
frames through when either the FIF_ALLMULTI flag is set or
when the mc_count value is positive.
At the same time, drivers are no longer notified about
monitor interfaces at all, this means they now need to
implement the start() and stop() callbacks and the new
change_filter_flags() callback. Also, the start()/stop()
ordering changed, start() is now called *before* any
add_interface() as it really should be, and stop() after
any remove_interface().
The patch also changes the behaviour of setting the bssid
to multicast for scanning when IEEE80211_HW_NO_PROBE_FILTERING
is set; the IEEE80211_HW_NO_PROBE_FILTERING flag is removed
and the filter flag FIF_BCN_PRBRESP_PROMISC introduced.
This is a lot more efficient for hardware like b43 that
supports it and other hardware can still set the BSSID
to all-ones.
Driver modifications by Johannes Berg (b43 & iwlwifi), Michael Wu
(rtl8187, adm8211, and p54), Larry Finger (b43legacy), and
Ivo van Doorn (rt2x00).
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Michael Wu <flamingice@sourmilk.net>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2007-09-17 07:29:23 +02:00
|
|
|
static void rt2x00lib_packetfilter_scheduled(struct work_struct *work)
|
|
|
|
{
|
|
|
|
struct rt2x00_dev *rt2x00dev =
|
|
|
|
container_of(work, struct rt2x00_dev, filter_work);
|
2007-10-06 14:13:38 +02:00
|
|
|
|
2008-04-04 00:01:43 +02:00
|
|
|
rt2x00dev->ops->lib->config_filter(rt2x00dev, rt2x00dev->packet_filter);
|
[PATCH] mac80211: revamp interface and filter configuration
Drivers are currently supposed to keep track of monitor
interfaces if they allow so-called "hard" monitor, and
they are also supposed to keep track of multicast etc.
This patch changes that, replaces the set_multicast_list()
callback with a new configure_filter() callback that takes
filter flags (FIF_*) instead of interface flags (IFF_*).
For a driver, this means it should open the filter as much
as necessary to get all frames requested by the filter flags.
Accordingly, the filter flags are named "positively", e.g.
FIF_ALLMULTI.
Multicast filtering is a bit special in that drivers that
have no multicast address filters need to allow multicast
frames through when either the FIF_ALLMULTI flag is set or
when the mc_count value is positive.
At the same time, drivers are no longer notified about
monitor interfaces at all, this means they now need to
implement the start() and stop() callbacks and the new
change_filter_flags() callback. Also, the start()/stop()
ordering changed, start() is now called *before* any
add_interface() as it really should be, and stop() after
any remove_interface().
The patch also changes the behaviour of setting the bssid
to multicast for scanning when IEEE80211_HW_NO_PROBE_FILTERING
is set; the IEEE80211_HW_NO_PROBE_FILTERING flag is removed
and the filter flag FIF_BCN_PRBRESP_PROMISC introduced.
This is a lot more efficient for hardware like b43 that
supports it and other hardware can still set the BSSID
to all-ones.
Driver modifications by Johannes Berg (b43 & iwlwifi), Michael Wu
(rtl8187, adm8211, and p54), Larry Finger (b43legacy), and
Ivo van Doorn (rt2x00).
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Michael Wu <flamingice@sourmilk.net>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2007-09-17 07:29:23 +02:00
|
|
|
}
|
|
|
|
|
rt2x00: Add per-interface structure
Rework the interface handling. Delete the interface structure
and replace it with a per-interface structure. This changes the
way rt2x00 handles the active interface drastically.
Copy ieee80211_bss_conf to the this rt2x00_intf structure during
the bss_info_changed() callback function. This will allow us to
reference it later, and removes the requirement for the device flag
SHORT_PREAMBLE flag which is interface specific.
Drivers receive the option to give the maximum number of virtual
interfaces the device can handle. Virtual interface support:
rt2400pci: 1 sta or 1 ap, * monitor interfaces
rt2500pci: 1 sta or 1 ap, * monitor interfaces
rt2500usb: 1 sta or 1 ap, * monitor interfaces
rt61pci: 1 sta or 4 ap, * monitor interfaces
rt73usb: 1 sta or 4 ap, * monitor interfaces
At the moment none of the drivers support AP and STA interfaces
simultaneously, this is a hardware limitation so future support
will be very unlikely.
Each interface structure receives its dedicated beacon entry,
with this we can easily work with beaconing while multiple master
mode interfaces are currently active.
The configuration handlers for the MAC, BSSID and type are
often called together since they all belong to the interface
configuration. Merge the 3 configuration calls and cleanup
the API between rt2x00lib and the drivers. While we are cleaning
up the interface configuration anyway, we might as well clean up
the configuration handler as well.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2008-02-03 15:49:59 +01:00
|
|
|
static void rt2x00lib_intf_scheduled_iter(void *data, u8 *mac,
|
|
|
|
struct ieee80211_vif *vif)
|
2007-10-06 13:34:52 +02:00
|
|
|
{
|
rt2x00: Add per-interface structure
Rework the interface handling. Delete the interface structure
and replace it with a per-interface structure. This changes the
way rt2x00 handles the active interface drastically.
Copy ieee80211_bss_conf to the this rt2x00_intf structure during
the bss_info_changed() callback function. This will allow us to
reference it later, and removes the requirement for the device flag
SHORT_PREAMBLE flag which is interface specific.
Drivers receive the option to give the maximum number of virtual
interfaces the device can handle. Virtual interface support:
rt2400pci: 1 sta or 1 ap, * monitor interfaces
rt2500pci: 1 sta or 1 ap, * monitor interfaces
rt2500usb: 1 sta or 1 ap, * monitor interfaces
rt61pci: 1 sta or 4 ap, * monitor interfaces
rt73usb: 1 sta or 4 ap, * monitor interfaces
At the moment none of the drivers support AP and STA interfaces
simultaneously, this is a hardware limitation so future support
will be very unlikely.
Each interface structure receives its dedicated beacon entry,
with this we can easily work with beaconing while multiple master
mode interfaces are currently active.
The configuration handlers for the MAC, BSSID and type are
often called together since they all belong to the interface
configuration. Merge the 3 configuration calls and cleanup
the API between rt2x00lib and the drivers. While we are cleaning
up the interface configuration anyway, we might as well clean up
the configuration handler as well.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2008-02-03 15:49:59 +01:00
|
|
|
struct rt2x00_dev *rt2x00dev = data;
|
|
|
|
struct rt2x00_intf *intf = vif_to_intf(vif);
|
|
|
|
struct sk_buff *skb;
|
|
|
|
struct ieee80211_tx_control control;
|
|
|
|
struct ieee80211_bss_conf conf;
|
|
|
|
int delayed_flags;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Copy all data we need during this action under the protection
|
|
|
|
* of a spinlock. Otherwise race conditions might occur which results
|
|
|
|
* into an invalid configuration.
|
|
|
|
*/
|
|
|
|
spin_lock(&intf->lock);
|
|
|
|
|
|
|
|
memcpy(&conf, &intf->conf, sizeof(conf));
|
|
|
|
delayed_flags = intf->delayed_flags;
|
|
|
|
intf->delayed_flags = 0;
|
|
|
|
|
|
|
|
spin_unlock(&intf->lock);
|
|
|
|
|
|
|
|
if (delayed_flags & DELAYED_UPDATE_BEACON) {
|
|
|
|
skb = ieee80211_beacon_get(rt2x00dev->hw, vif, &control);
|
2008-04-09 20:46:27 +02:00
|
|
|
if (skb && rt2x00dev->ops->hw->beacon_update(rt2x00dev->hw,
|
|
|
|
skb, &control))
|
rt2x00: Add per-interface structure
Rework the interface handling. Delete the interface structure
and replace it with a per-interface structure. This changes the
way rt2x00 handles the active interface drastically.
Copy ieee80211_bss_conf to the this rt2x00_intf structure during
the bss_info_changed() callback function. This will allow us to
reference it later, and removes the requirement for the device flag
SHORT_PREAMBLE flag which is interface specific.
Drivers receive the option to give the maximum number of virtual
interfaces the device can handle. Virtual interface support:
rt2400pci: 1 sta or 1 ap, * monitor interfaces
rt2500pci: 1 sta or 1 ap, * monitor interfaces
rt2500usb: 1 sta or 1 ap, * monitor interfaces
rt61pci: 1 sta or 4 ap, * monitor interfaces
rt73usb: 1 sta or 4 ap, * monitor interfaces
At the moment none of the drivers support AP and STA interfaces
simultaneously, this is a hardware limitation so future support
will be very unlikely.
Each interface structure receives its dedicated beacon entry,
with this we can easily work with beaconing while multiple master
mode interfaces are currently active.
The configuration handlers for the MAC, BSSID and type are
often called together since they all belong to the interface
configuration. Merge the 3 configuration calls and cleanup
the API between rt2x00lib and the drivers. While we are cleaning
up the interface configuration anyway, we might as well clean up
the configuration handler as well.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2008-02-03 15:49:59 +01:00
|
|
|
dev_kfree_skb(skb);
|
|
|
|
}
|
|
|
|
|
2008-03-09 22:46:18 +01:00
|
|
|
if (delayed_flags & DELAYED_CONFIG_ERP)
|
|
|
|
rt2x00lib_config_erp(rt2x00dev, intf, &intf->conf);
|
2008-03-31 15:53:44 +02:00
|
|
|
|
|
|
|
if (delayed_flags & DELAYED_LED_ASSOC)
|
|
|
|
rt2x00leds_led_assoc(rt2x00dev, !!rt2x00dev->intf_associated);
|
rt2x00: Add per-interface structure
Rework the interface handling. Delete the interface structure
and replace it with a per-interface structure. This changes the
way rt2x00 handles the active interface drastically.
Copy ieee80211_bss_conf to the this rt2x00_intf structure during
the bss_info_changed() callback function. This will allow us to
reference it later, and removes the requirement for the device flag
SHORT_PREAMBLE flag which is interface specific.
Drivers receive the option to give the maximum number of virtual
interfaces the device can handle. Virtual interface support:
rt2400pci: 1 sta or 1 ap, * monitor interfaces
rt2500pci: 1 sta or 1 ap, * monitor interfaces
rt2500usb: 1 sta or 1 ap, * monitor interfaces
rt61pci: 1 sta or 4 ap, * monitor interfaces
rt73usb: 1 sta or 4 ap, * monitor interfaces
At the moment none of the drivers support AP and STA interfaces
simultaneously, this is a hardware limitation so future support
will be very unlikely.
Each interface structure receives its dedicated beacon entry,
with this we can easily work with beaconing while multiple master
mode interfaces are currently active.
The configuration handlers for the MAC, BSSID and type are
often called together since they all belong to the interface
configuration. Merge the 3 configuration calls and cleanup
the API between rt2x00lib and the drivers. While we are cleaning
up the interface configuration anyway, we might as well clean up
the configuration handler as well.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2008-02-03 15:49:59 +01:00
|
|
|
}
|
2007-10-06 13:34:52 +02:00
|
|
|
|
rt2x00: Add per-interface structure
Rework the interface handling. Delete the interface structure
and replace it with a per-interface structure. This changes the
way rt2x00 handles the active interface drastically.
Copy ieee80211_bss_conf to the this rt2x00_intf structure during
the bss_info_changed() callback function. This will allow us to
reference it later, and removes the requirement for the device flag
SHORT_PREAMBLE flag which is interface specific.
Drivers receive the option to give the maximum number of virtual
interfaces the device can handle. Virtual interface support:
rt2400pci: 1 sta or 1 ap, * monitor interfaces
rt2500pci: 1 sta or 1 ap, * monitor interfaces
rt2500usb: 1 sta or 1 ap, * monitor interfaces
rt61pci: 1 sta or 4 ap, * monitor interfaces
rt73usb: 1 sta or 4 ap, * monitor interfaces
At the moment none of the drivers support AP and STA interfaces
simultaneously, this is a hardware limitation so future support
will be very unlikely.
Each interface structure receives its dedicated beacon entry,
with this we can easily work with beaconing while multiple master
mode interfaces are currently active.
The configuration handlers for the MAC, BSSID and type are
often called together since they all belong to the interface
configuration. Merge the 3 configuration calls and cleanup
the API between rt2x00lib and the drivers. While we are cleaning
up the interface configuration anyway, we might as well clean up
the configuration handler as well.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2008-02-03 15:49:59 +01:00
|
|
|
static void rt2x00lib_intf_scheduled(struct work_struct *work)
|
|
|
|
{
|
|
|
|
struct rt2x00_dev *rt2x00dev =
|
|
|
|
container_of(work, struct rt2x00_dev, intf_work);
|
2007-12-28 14:32:58 +01:00
|
|
|
|
|
|
|
/*
|
rt2x00: Add per-interface structure
Rework the interface handling. Delete the interface structure
and replace it with a per-interface structure. This changes the
way rt2x00 handles the active interface drastically.
Copy ieee80211_bss_conf to the this rt2x00_intf structure during
the bss_info_changed() callback function. This will allow us to
reference it later, and removes the requirement for the device flag
SHORT_PREAMBLE flag which is interface specific.
Drivers receive the option to give the maximum number of virtual
interfaces the device can handle. Virtual interface support:
rt2400pci: 1 sta or 1 ap, * monitor interfaces
rt2500pci: 1 sta or 1 ap, * monitor interfaces
rt2500usb: 1 sta or 1 ap, * monitor interfaces
rt61pci: 1 sta or 4 ap, * monitor interfaces
rt73usb: 1 sta or 4 ap, * monitor interfaces
At the moment none of the drivers support AP and STA interfaces
simultaneously, this is a hardware limitation so future support
will be very unlikely.
Each interface structure receives its dedicated beacon entry,
with this we can easily work with beaconing while multiple master
mode interfaces are currently active.
The configuration handlers for the MAC, BSSID and type are
often called together since they all belong to the interface
configuration. Merge the 3 configuration calls and cleanup
the API between rt2x00lib and the drivers. While we are cleaning
up the interface configuration anyway, we might as well clean up
the configuration handler as well.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2008-02-03 15:49:59 +01:00
|
|
|
* Iterate over each interface and perform the
|
|
|
|
* requested configurations.
|
2007-12-28 14:32:58 +01:00
|
|
|
*/
|
rt2x00: Add per-interface structure
Rework the interface handling. Delete the interface structure
and replace it with a per-interface structure. This changes the
way rt2x00 handles the active interface drastically.
Copy ieee80211_bss_conf to the this rt2x00_intf structure during
the bss_info_changed() callback function. This will allow us to
reference it later, and removes the requirement for the device flag
SHORT_PREAMBLE flag which is interface specific.
Drivers receive the option to give the maximum number of virtual
interfaces the device can handle. Virtual interface support:
rt2400pci: 1 sta or 1 ap, * monitor interfaces
rt2500pci: 1 sta or 1 ap, * monitor interfaces
rt2500usb: 1 sta or 1 ap, * monitor interfaces
rt61pci: 1 sta or 4 ap, * monitor interfaces
rt73usb: 1 sta or 4 ap, * monitor interfaces
At the moment none of the drivers support AP and STA interfaces
simultaneously, this is a hardware limitation so future support
will be very unlikely.
Each interface structure receives its dedicated beacon entry,
with this we can easily work with beaconing while multiple master
mode interfaces are currently active.
The configuration handlers for the MAC, BSSID and type are
often called together since they all belong to the interface
configuration. Merge the 3 configuration calls and cleanup
the API between rt2x00lib and the drivers. While we are cleaning
up the interface configuration anyway, we might as well clean up
the configuration handler as well.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2008-02-03 15:49:59 +01:00
|
|
|
ieee80211_iterate_active_interfaces(rt2x00dev->hw,
|
|
|
|
rt2x00lib_intf_scheduled_iter,
|
|
|
|
rt2x00dev);
|
2007-10-06 13:34:52 +02:00
|
|
|
}
|
|
|
|
|
2007-09-26 02:57:13 +02:00
|
|
|
/*
|
|
|
|
* Interrupt context handlers.
|
|
|
|
*/
|
rt2x00: Add per-interface structure
Rework the interface handling. Delete the interface structure
and replace it with a per-interface structure. This changes the
way rt2x00 handles the active interface drastically.
Copy ieee80211_bss_conf to the this rt2x00_intf structure during
the bss_info_changed() callback function. This will allow us to
reference it later, and removes the requirement for the device flag
SHORT_PREAMBLE flag which is interface specific.
Drivers receive the option to give the maximum number of virtual
interfaces the device can handle. Virtual interface support:
rt2400pci: 1 sta or 1 ap, * monitor interfaces
rt2500pci: 1 sta or 1 ap, * monitor interfaces
rt2500usb: 1 sta or 1 ap, * monitor interfaces
rt61pci: 1 sta or 4 ap, * monitor interfaces
rt73usb: 1 sta or 4 ap, * monitor interfaces
At the moment none of the drivers support AP and STA interfaces
simultaneously, this is a hardware limitation so future support
will be very unlikely.
Each interface structure receives its dedicated beacon entry,
with this we can easily work with beaconing while multiple master
mode interfaces are currently active.
The configuration handlers for the MAC, BSSID and type are
often called together since they all belong to the interface
configuration. Merge the 3 configuration calls and cleanup
the API between rt2x00lib and the drivers. While we are cleaning
up the interface configuration anyway, we might as well clean up
the configuration handler as well.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2008-02-03 15:49:59 +01:00
|
|
|
static void rt2x00lib_beacondone_iter(void *data, u8 *mac,
|
|
|
|
struct ieee80211_vif *vif)
|
2007-09-26 02:57:13 +02:00
|
|
|
{
|
rt2x00: Add per-interface structure
Rework the interface handling. Delete the interface structure
and replace it with a per-interface structure. This changes the
way rt2x00 handles the active interface drastically.
Copy ieee80211_bss_conf to the this rt2x00_intf structure during
the bss_info_changed() callback function. This will allow us to
reference it later, and removes the requirement for the device flag
SHORT_PREAMBLE flag which is interface specific.
Drivers receive the option to give the maximum number of virtual
interfaces the device can handle. Virtual interface support:
rt2400pci: 1 sta or 1 ap, * monitor interfaces
rt2500pci: 1 sta or 1 ap, * monitor interfaces
rt2500usb: 1 sta or 1 ap, * monitor interfaces
rt61pci: 1 sta or 4 ap, * monitor interfaces
rt73usb: 1 sta or 4 ap, * monitor interfaces
At the moment none of the drivers support AP and STA interfaces
simultaneously, this is a hardware limitation so future support
will be very unlikely.
Each interface structure receives its dedicated beacon entry,
with this we can easily work with beaconing while multiple master
mode interfaces are currently active.
The configuration handlers for the MAC, BSSID and type are
often called together since they all belong to the interface
configuration. Merge the 3 configuration calls and cleanup
the API between rt2x00lib and the drivers. While we are cleaning
up the interface configuration anyway, we might as well clean up
the configuration handler as well.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2008-02-03 15:49:59 +01:00
|
|
|
struct rt2x00_intf *intf = vif_to_intf(vif);
|
2007-09-26 02:57:13 +02:00
|
|
|
|
rt2x00: Add per-interface structure
Rework the interface handling. Delete the interface structure
and replace it with a per-interface structure. This changes the
way rt2x00 handles the active interface drastically.
Copy ieee80211_bss_conf to the this rt2x00_intf structure during
the bss_info_changed() callback function. This will allow us to
reference it later, and removes the requirement for the device flag
SHORT_PREAMBLE flag which is interface specific.
Drivers receive the option to give the maximum number of virtual
interfaces the device can handle. Virtual interface support:
rt2400pci: 1 sta or 1 ap, * monitor interfaces
rt2500pci: 1 sta or 1 ap, * monitor interfaces
rt2500usb: 1 sta or 1 ap, * monitor interfaces
rt61pci: 1 sta or 4 ap, * monitor interfaces
rt73usb: 1 sta or 4 ap, * monitor interfaces
At the moment none of the drivers support AP and STA interfaces
simultaneously, this is a hardware limitation so future support
will be very unlikely.
Each interface structure receives its dedicated beacon entry,
with this we can easily work with beaconing while multiple master
mode interfaces are currently active.
The configuration handlers for the MAC, BSSID and type are
often called together since they all belong to the interface
configuration. Merge the 3 configuration calls and cleanup
the API between rt2x00lib and the drivers. While we are cleaning
up the interface configuration anyway, we might as well clean up
the configuration handler as well.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2008-02-03 15:49:59 +01:00
|
|
|
if (vif->type != IEEE80211_IF_TYPE_AP &&
|
|
|
|
vif->type != IEEE80211_IF_TYPE_IBSS)
|
2007-09-26 02:57:13 +02:00
|
|
|
return;
|
|
|
|
|
rt2x00: Add per-interface structure
Rework the interface handling. Delete the interface structure
and replace it with a per-interface structure. This changes the
way rt2x00 handles the active interface drastically.
Copy ieee80211_bss_conf to the this rt2x00_intf structure during
the bss_info_changed() callback function. This will allow us to
reference it later, and removes the requirement for the device flag
SHORT_PREAMBLE flag which is interface specific.
Drivers receive the option to give the maximum number of virtual
interfaces the device can handle. Virtual interface support:
rt2400pci: 1 sta or 1 ap, * monitor interfaces
rt2500pci: 1 sta or 1 ap, * monitor interfaces
rt2500usb: 1 sta or 1 ap, * monitor interfaces
rt61pci: 1 sta or 4 ap, * monitor interfaces
rt73usb: 1 sta or 4 ap, * monitor interfaces
At the moment none of the drivers support AP and STA interfaces
simultaneously, this is a hardware limitation so future support
will be very unlikely.
Each interface structure receives its dedicated beacon entry,
with this we can easily work with beaconing while multiple master
mode interfaces are currently active.
The configuration handlers for the MAC, BSSID and type are
often called together since they all belong to the interface
configuration. Merge the 3 configuration calls and cleanup
the API between rt2x00lib and the drivers. While we are cleaning
up the interface configuration anyway, we might as well clean up
the configuration handler as well.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2008-02-03 15:49:59 +01:00
|
|
|
spin_lock(&intf->lock);
|
|
|
|
intf->delayed_flags |= DELAYED_UPDATE_BEACON;
|
|
|
|
spin_unlock(&intf->lock);
|
2007-09-26 02:57:13 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
void rt2x00lib_beacondone(struct rt2x00_dev *rt2x00dev)
|
|
|
|
{
|
|
|
|
if (!test_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags))
|
|
|
|
return;
|
|
|
|
|
2008-05-23 18:14:02 +02:00
|
|
|
ieee80211_iterate_active_interfaces_atomic(rt2x00dev->hw,
|
|
|
|
rt2x00lib_beacondone_iter,
|
|
|
|
rt2x00dev);
|
rt2x00: Add per-interface structure
Rework the interface handling. Delete the interface structure
and replace it with a per-interface structure. This changes the
way rt2x00 handles the active interface drastically.
Copy ieee80211_bss_conf to the this rt2x00_intf structure during
the bss_info_changed() callback function. This will allow us to
reference it later, and removes the requirement for the device flag
SHORT_PREAMBLE flag which is interface specific.
Drivers receive the option to give the maximum number of virtual
interfaces the device can handle. Virtual interface support:
rt2400pci: 1 sta or 1 ap, * monitor interfaces
rt2500pci: 1 sta or 1 ap, * monitor interfaces
rt2500usb: 1 sta or 1 ap, * monitor interfaces
rt61pci: 1 sta or 4 ap, * monitor interfaces
rt73usb: 1 sta or 4 ap, * monitor interfaces
At the moment none of the drivers support AP and STA interfaces
simultaneously, this is a hardware limitation so future support
will be very unlikely.
Each interface structure receives its dedicated beacon entry,
with this we can easily work with beaconing while multiple master
mode interfaces are currently active.
The configuration handlers for the MAC, BSSID and type are
often called together since they all belong to the interface
configuration. Merge the 3 configuration calls and cleanup
the API between rt2x00lib and the drivers. While we are cleaning
up the interface configuration anyway, we might as well clean up
the configuration handler as well.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2008-02-03 15:49:59 +01:00
|
|
|
|
|
|
|
queue_work(rt2x00dev->hw->workqueue, &rt2x00dev->intf_work);
|
2007-09-26 02:57:13 +02:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(rt2x00lib_beacondone);
|
|
|
|
|
2008-02-05 22:42:23 +01:00
|
|
|
void rt2x00lib_txdone(struct queue_entry *entry,
|
|
|
|
struct txdone_entry_desc *txdesc)
|
2007-09-26 02:57:13 +02:00
|
|
|
{
|
2008-02-05 22:42:23 +01:00
|
|
|
struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
|
2008-02-17 17:32:08 +01:00
|
|
|
struct skb_frame_desc *skbdesc;
|
2008-02-05 22:42:23 +01:00
|
|
|
struct ieee80211_tx_status tx_status;
|
|
|
|
int success = !!(txdesc->status == TX_SUCCESS ||
|
|
|
|
txdesc->status == TX_SUCCESS_RETRY);
|
|
|
|
int fail = !!(txdesc->status == TX_FAIL_RETRY ||
|
|
|
|
txdesc->status == TX_FAIL_INVALID ||
|
|
|
|
txdesc->status == TX_FAIL_OTHER);
|
2007-09-26 02:57:13 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Update TX statistics.
|
|
|
|
*/
|
2007-10-13 16:26:12 +02:00
|
|
|
rt2x00dev->link.qual.tx_success += success;
|
2008-05-23 18:13:49 +02:00
|
|
|
rt2x00dev->link.qual.tx_failed += fail;
|
2007-09-26 02:57:13 +02:00
|
|
|
|
2008-02-05 22:42:23 +01:00
|
|
|
/*
|
|
|
|
* Initialize TX status
|
|
|
|
*/
|
|
|
|
tx_status.flags = 0;
|
|
|
|
tx_status.ack_signal = 0;
|
|
|
|
tx_status.excessive_retries = (txdesc->status == TX_FAIL_RETRY);
|
|
|
|
tx_status.retry_count = txdesc->retry;
|
2008-03-09 22:39:32 +01:00
|
|
|
memcpy(&tx_status.control, txdesc->control, sizeof(*txdesc->control));
|
2008-02-05 22:42:23 +01:00
|
|
|
|
|
|
|
if (!(tx_status.control.flags & IEEE80211_TXCTL_NO_ACK)) {
|
2007-09-26 02:57:13 +02:00
|
|
|
if (success)
|
2008-02-05 22:42:23 +01:00
|
|
|
tx_status.flags |= IEEE80211_TX_STATUS_ACK;
|
2007-09-26 02:57:13 +02:00
|
|
|
else
|
2008-02-05 22:42:23 +01:00
|
|
|
rt2x00dev->low_level_stats.dot11ACKFailureCount++;
|
2007-09-26 02:57:13 +02:00
|
|
|
}
|
|
|
|
|
2008-02-05 22:42:23 +01:00
|
|
|
tx_status.queue_length = entry->queue->limit;
|
|
|
|
tx_status.queue_number = tx_status.control.queue;
|
2007-09-26 02:57:13 +02:00
|
|
|
|
2008-02-05 22:42:23 +01:00
|
|
|
if (tx_status.control.flags & IEEE80211_TXCTL_USE_RTS_CTS) {
|
2007-09-26 02:57:13 +02:00
|
|
|
if (success)
|
2008-02-05 22:42:23 +01:00
|
|
|
rt2x00dev->low_level_stats.dot11RTSSuccessCount++;
|
2007-09-26 02:57:13 +02:00
|
|
|
else
|
2008-02-05 22:42:23 +01:00
|
|
|
rt2x00dev->low_level_stats.dot11RTSFailureCount++;
|
2007-09-26 02:57:13 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2008-02-17 17:32:08 +01:00
|
|
|
* Send the tx_status to debugfs. Only send the status report
|
|
|
|
* to mac80211 when the frame originated from there. If this was
|
|
|
|
* a extra frame coming through a mac80211 library call (RTS/CTS)
|
|
|
|
* then we should not send the status report back.
|
|
|
|
* If send to mac80211, mac80211 will clean up the skb structure,
|
|
|
|
* otherwise we have to do it ourself.
|
2007-09-26 02:57:13 +02:00
|
|
|
*/
|
2008-02-17 17:32:08 +01:00
|
|
|
skbdesc = get_skb_frame_desc(entry->skb);
|
|
|
|
skbdesc->frame_type = DUMP_FRAME_TXDONE;
|
|
|
|
|
2007-11-27 21:49:29 +01:00
|
|
|
rt2x00debug_dump_frame(rt2x00dev, entry->skb);
|
2008-02-17 17:32:08 +01:00
|
|
|
|
|
|
|
if (!(skbdesc->flags & FRAME_DESC_DRIVER_GENERATED))
|
|
|
|
ieee80211_tx_status_irqsafe(rt2x00dev->hw,
|
|
|
|
entry->skb, &tx_status);
|
|
|
|
else
|
|
|
|
dev_kfree_skb(entry->skb);
|
2007-09-26 02:57:13 +02:00
|
|
|
entry->skb = NULL;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(rt2x00lib_txdone);
|
|
|
|
|
2008-02-05 22:42:23 +01:00
|
|
|
void rt2x00lib_rxdone(struct queue_entry *entry,
|
|
|
|
struct rxdone_entry_desc *rxdesc)
|
2007-09-26 02:57:13 +02:00
|
|
|
{
|
2008-02-05 22:42:23 +01:00
|
|
|
struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
|
2007-09-26 02:57:13 +02:00
|
|
|
struct ieee80211_rx_status *rx_status = &rt2x00dev->rx_status;
|
2008-01-24 19:38:38 +01:00
|
|
|
struct ieee80211_supported_band *sband;
|
2007-11-27 21:50:26 +01:00
|
|
|
struct ieee80211_hdr *hdr;
|
2008-02-03 15:50:40 +01:00
|
|
|
const struct rt2x00_rate *rate;
|
2007-09-26 02:57:13 +02:00
|
|
|
unsigned int i;
|
2008-02-03 15:50:40 +01:00
|
|
|
int idx = -1;
|
2007-11-27 21:50:26 +01:00
|
|
|
u16 fc;
|
2007-09-26 02:57:13 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Update RX statistics.
|
|
|
|
*/
|
2008-01-24 19:38:38 +01:00
|
|
|
sband = &rt2x00dev->bands[rt2x00dev->curr_band];
|
|
|
|
for (i = 0; i < sband->n_bitrates; i++) {
|
2008-02-03 15:50:40 +01:00
|
|
|
rate = rt2x00_get_rate(sband->bitrates[i].hw_value);
|
2007-09-26 02:57:13 +02:00
|
|
|
|
2008-03-15 21:38:07 +01:00
|
|
|
if (((rxdesc->dev_flags & RXDONE_SIGNAL_PLCP) &&
|
|
|
|
(rate->plcp == rxdesc->signal)) ||
|
|
|
|
(!(rxdesc->dev_flags & RXDONE_SIGNAL_PLCP) &&
|
|
|
|
(rate->bitrate == rxdesc->signal))) {
|
2008-01-24 19:38:38 +01:00
|
|
|
idx = i;
|
2007-09-26 02:57:13 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-03-25 14:12:45 +01:00
|
|
|
if (idx < 0) {
|
|
|
|
WARNING(rt2x00dev, "Frame received with unrecognized signal,"
|
|
|
|
"signal=0x%.2x, plcp=%d.\n", rxdesc->signal,
|
|
|
|
!!(rxdesc->dev_flags & RXDONE_SIGNAL_PLCP));
|
|
|
|
idx = 0;
|
|
|
|
}
|
|
|
|
|
2007-11-27 21:50:26 +01:00
|
|
|
/*
|
2008-01-06 23:41:28 +01:00
|
|
|
* Only update link status if this is a beacon frame carrying our bssid.
|
2007-11-27 21:50:26 +01:00
|
|
|
*/
|
2008-02-03 15:50:40 +01:00
|
|
|
hdr = (struct ieee80211_hdr *)entry->skb->data;
|
2008-01-06 23:41:28 +01:00
|
|
|
fc = le16_to_cpu(hdr->frame_control);
|
2008-03-15 21:38:07 +01:00
|
|
|
if (is_beacon(fc) && (rxdesc->dev_flags & RXDONE_MY_BSS))
|
2008-02-05 22:42:23 +01:00
|
|
|
rt2x00lib_update_link_stats(&rt2x00dev->link, rxdesc->rssi);
|
2007-11-27 21:50:26 +01:00
|
|
|
|
2007-10-13 16:26:12 +02:00
|
|
|
rt2x00dev->link.qual.rx_success++;
|
2007-10-13 16:26:36 +02:00
|
|
|
|
2008-01-24 19:38:38 +01:00
|
|
|
rx_status->rate_idx = idx;
|
[PATCH] mac80211: revamp interface and filter configuration
Drivers are currently supposed to keep track of monitor
interfaces if they allow so-called "hard" monitor, and
they are also supposed to keep track of multicast etc.
This patch changes that, replaces the set_multicast_list()
callback with a new configure_filter() callback that takes
filter flags (FIF_*) instead of interface flags (IFF_*).
For a driver, this means it should open the filter as much
as necessary to get all frames requested by the filter flags.
Accordingly, the filter flags are named "positively", e.g.
FIF_ALLMULTI.
Multicast filtering is a bit special in that drivers that
have no multicast address filters need to allow multicast
frames through when either the FIF_ALLMULTI flag is set or
when the mc_count value is positive.
At the same time, drivers are no longer notified about
monitor interfaces at all, this means they now need to
implement the start() and stop() callbacks and the new
change_filter_flags() callback. Also, the start()/stop()
ordering changed, start() is now called *before* any
add_interface() as it really should be, and stop() after
any remove_interface().
The patch also changes the behaviour of setting the bssid
to multicast for scanning when IEEE80211_HW_NO_PROBE_FILTERING
is set; the IEEE80211_HW_NO_PROBE_FILTERING flag is removed
and the filter flag FIF_BCN_PRBRESP_PROMISC introduced.
This is a lot more efficient for hardware like b43 that
supports it and other hardware can still set the BSSID
to all-ones.
Driver modifications by Johannes Berg (b43 & iwlwifi), Michael Wu
(rtl8187, adm8211, and p54), Larry Finger (b43legacy), and
Ivo van Doorn (rt2x00).
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Michael Wu <flamingice@sourmilk.net>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2007-09-17 07:29:23 +02:00
|
|
|
rx_status->signal =
|
2008-02-05 22:42:23 +01:00
|
|
|
rt2x00lib_calculate_link_signal(rt2x00dev, rxdesc->rssi);
|
|
|
|
rx_status->ssi = rxdesc->rssi;
|
|
|
|
rx_status->flag = rxdesc->flags;
|
2007-10-13 16:26:36 +02:00
|
|
|
rx_status->antenna = rt2x00dev->link.ant.active.rx;
|
2007-09-26 02:57:13 +02:00
|
|
|
|
|
|
|
/*
|
2008-02-05 22:42:23 +01:00
|
|
|
* Send frame to mac80211 & debugfs.
|
|
|
|
* mac80211 will clean up the skb structure.
|
2007-09-26 02:57:13 +02:00
|
|
|
*/
|
2008-02-05 22:42:23 +01:00
|
|
|
get_skb_frame_desc(entry->skb)->frame_type = DUMP_FRAME_RXDONE;
|
|
|
|
rt2x00debug_dump_frame(rt2x00dev, entry->skb);
|
|
|
|
ieee80211_rx_irqsafe(rt2x00dev->hw, entry->skb, rx_status);
|
|
|
|
entry->skb = NULL;
|
2007-09-26 02:57:13 +02:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(rt2x00lib_rxdone);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* TX descriptor initializer
|
|
|
|
*/
|
|
|
|
void rt2x00lib_write_tx_desc(struct rt2x00_dev *rt2x00dev,
|
2008-01-24 10:56:25 +01:00
|
|
|
struct sk_buff *skb,
|
2007-09-26 02:57:13 +02:00
|
|
|
struct ieee80211_tx_control *control)
|
|
|
|
{
|
2008-02-05 22:42:23 +01:00
|
|
|
struct txentry_desc txdesc;
|
|
|
|
struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb);
|
2008-03-09 22:41:53 +01:00
|
|
|
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skbdesc->data;
|
2008-02-03 15:50:40 +01:00
|
|
|
const struct rt2x00_rate *rate;
|
2007-09-26 02:57:13 +02:00
|
|
|
int tx_rate;
|
2008-01-24 10:56:25 +01:00
|
|
|
int length;
|
2007-09-26 02:57:13 +02:00
|
|
|
int duration;
|
|
|
|
int residual;
|
|
|
|
u16 frame_control;
|
|
|
|
u16 seq_ctrl;
|
|
|
|
|
2008-02-05 22:42:23 +01:00
|
|
|
memset(&txdesc, 0, sizeof(txdesc));
|
2007-09-26 02:57:13 +02:00
|
|
|
|
2008-02-03 15:52:21 +01:00
|
|
|
txdesc.queue = skbdesc->entry->queue->qid;
|
2008-02-05 22:42:23 +01:00
|
|
|
txdesc.cw_min = skbdesc->entry->queue->cw_min;
|
|
|
|
txdesc.cw_max = skbdesc->entry->queue->cw_max;
|
|
|
|
txdesc.aifs = skbdesc->entry->queue->aifs;
|
2007-09-26 02:57:13 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Read required fields from ieee80211 header.
|
|
|
|
*/
|
2008-02-03 15:50:40 +01:00
|
|
|
frame_control = le16_to_cpu(hdr->frame_control);
|
|
|
|
seq_ctrl = le16_to_cpu(hdr->seq_ctrl);
|
2007-09-26 02:57:13 +02:00
|
|
|
|
2008-01-24 19:38:38 +01:00
|
|
|
tx_rate = control->tx_rate->hw_value;
|
2007-09-26 02:57:13 +02:00
|
|
|
|
2007-10-27 13:43:49 +02:00
|
|
|
/*
|
|
|
|
* Check whether this frame is to be acked
|
|
|
|
*/
|
|
|
|
if (!(control->flags & IEEE80211_TXCTL_NO_ACK))
|
2008-02-05 22:42:23 +01:00
|
|
|
__set_bit(ENTRY_TXD_ACK, &txdesc.flags);
|
2007-10-27 13:43:49 +02:00
|
|
|
|
2007-09-26 02:57:13 +02:00
|
|
|
/*
|
|
|
|
* Check if this is a RTS/CTS frame
|
|
|
|
*/
|
|
|
|
if (is_rts_frame(frame_control) || is_cts_frame(frame_control)) {
|
2008-02-05 22:42:23 +01:00
|
|
|
__set_bit(ENTRY_TXD_BURST, &txdesc.flags);
|
2007-10-27 13:43:49 +02:00
|
|
|
if (is_rts_frame(frame_control)) {
|
2008-02-05 22:42:23 +01:00
|
|
|
__set_bit(ENTRY_TXD_RTS_FRAME, &txdesc.flags);
|
|
|
|
__set_bit(ENTRY_TXD_ACK, &txdesc.flags);
|
2007-10-27 13:43:49 +02:00
|
|
|
} else
|
2008-02-05 22:42:23 +01:00
|
|
|
__clear_bit(ENTRY_TXD_ACK, &txdesc.flags);
|
2007-09-26 02:57:13 +02:00
|
|
|
if (control->rts_cts_rate)
|
2008-01-24 19:38:38 +01:00
|
|
|
tx_rate = control->rts_cts_rate->hw_value;
|
2007-09-26 02:57:13 +02:00
|
|
|
}
|
|
|
|
|
2008-02-03 15:50:40 +01:00
|
|
|
rate = rt2x00_get_rate(tx_rate);
|
2007-09-26 02:57:13 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Check if more fragments are pending
|
|
|
|
*/
|
2008-02-03 15:50:40 +01:00
|
|
|
if (ieee80211_get_morefrag(hdr)) {
|
2008-02-05 22:42:23 +01:00
|
|
|
__set_bit(ENTRY_TXD_BURST, &txdesc.flags);
|
|
|
|
__set_bit(ENTRY_TXD_MORE_FRAG, &txdesc.flags);
|
2007-09-26 02:57:13 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Beacons and probe responses require the tsf timestamp
|
|
|
|
* to be inserted into the frame.
|
|
|
|
*/
|
2008-02-03 15:54:57 +01:00
|
|
|
if (control->queue == RT2X00_BCN_QUEUE_BEACON ||
|
2007-09-26 02:57:13 +02:00
|
|
|
is_probe_resp(frame_control))
|
2008-02-05 22:42:23 +01:00
|
|
|
__set_bit(ENTRY_TXD_REQ_TIMESTAMP, &txdesc.flags);
|
2007-09-26 02:57:13 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Determine with what IFS priority this frame should be send.
|
|
|
|
* Set ifs to IFS_SIFS when the this is not the first fragment,
|
|
|
|
* or this fragment came after RTS/CTS.
|
|
|
|
*/
|
|
|
|
if ((seq_ctrl & IEEE80211_SCTL_FRAG) > 0 ||
|
2008-02-05 22:42:23 +01:00
|
|
|
test_bit(ENTRY_TXD_RTS_FRAME, &txdesc.flags))
|
|
|
|
txdesc.ifs = IFS_SIFS;
|
2007-09-26 02:57:13 +02:00
|
|
|
else
|
2008-02-05 22:42:23 +01:00
|
|
|
txdesc.ifs = IFS_BACKOFF;
|
2007-09-26 02:57:13 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* PLCP setup
|
|
|
|
* Length calculation depends on OFDM/CCK rate.
|
|
|
|
*/
|
2008-02-03 15:50:40 +01:00
|
|
|
txdesc.signal = rate->plcp;
|
2008-02-05 22:42:23 +01:00
|
|
|
txdesc.service = 0x04;
|
2007-09-26 02:57:13 +02:00
|
|
|
|
2008-03-09 22:41:53 +01:00
|
|
|
length = skbdesc->data_len + FCS_LEN;
|
2008-02-03 15:50:40 +01:00
|
|
|
if (rate->flags & DEV_RATE_OFDM) {
|
|
|
|
__set_bit(ENTRY_TXD_OFDM_RATE, &txdesc.flags);
|
|
|
|
|
2008-02-05 22:42:23 +01:00
|
|
|
txdesc.length_high = (length >> 6) & 0x3f;
|
|
|
|
txdesc.length_low = length & 0x3f;
|
2007-09-26 02:57:13 +02:00
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* Convert length to microseconds.
|
|
|
|
*/
|
2008-02-03 15:50:40 +01:00
|
|
|
residual = get_duration_res(length, rate->bitrate);
|
|
|
|
duration = get_duration(length, rate->bitrate);
|
2007-09-26 02:57:13 +02:00
|
|
|
|
|
|
|
if (residual != 0) {
|
|
|
|
duration++;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Check if we need to set the Length Extension
|
|
|
|
*/
|
2008-02-03 15:50:40 +01:00
|
|
|
if (rate->bitrate == 110 && residual <= 30)
|
2008-02-05 22:42:23 +01:00
|
|
|
txdesc.service |= 0x80;
|
2007-09-26 02:57:13 +02:00
|
|
|
}
|
|
|
|
|
2008-02-05 22:42:23 +01:00
|
|
|
txdesc.length_high = (duration >> 8) & 0xff;
|
|
|
|
txdesc.length_low = duration & 0xff;
|
2007-09-26 02:57:13 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* When preamble is enabled we should set the
|
|
|
|
* preamble bit for the signal.
|
|
|
|
*/
|
2008-02-03 15:50:40 +01:00
|
|
|
if (rt2x00_get_rate_preamble(tx_rate))
|
2008-02-05 22:42:23 +01:00
|
|
|
txdesc.signal |= 0x08;
|
2007-09-26 02:57:13 +02:00
|
|
|
}
|
|
|
|
|
2008-02-05 22:42:23 +01:00
|
|
|
rt2x00dev->ops->lib->write_tx_desc(rt2x00dev, skb, &txdesc, control);
|
2008-01-24 10:56:25 +01:00
|
|
|
|
|
|
|
/*
|
2008-02-05 22:42:23 +01:00
|
|
|
* Update queue entry.
|
2008-01-24 10:56:25 +01:00
|
|
|
*/
|
|
|
|
skbdesc->entry->skb = skb;
|
2007-11-27 21:49:29 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
* The frame has been completely initialized and ready
|
|
|
|
* for sending to the device. The caller will push the
|
|
|
|
* frame to the device, but we are going to push the
|
|
|
|
* frame to debugfs here.
|
|
|
|
*/
|
|
|
|
skbdesc->frame_type = DUMP_FRAME_TX;
|
|
|
|
rt2x00debug_dump_frame(rt2x00dev, skb);
|
2007-09-26 02:57:13 +02:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(rt2x00lib_write_tx_desc);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Driver initialization handlers.
|
|
|
|
*/
|
2008-02-03 15:50:40 +01:00
|
|
|
const struct rt2x00_rate rt2x00_supported_rates[12] = {
|
|
|
|
{
|
2008-03-09 22:48:08 +01:00
|
|
|
.flags = DEV_RATE_CCK | DEV_RATE_BASIC,
|
2008-02-03 15:50:40 +01:00
|
|
|
.bitrate = 10,
|
2008-03-09 22:48:08 +01:00
|
|
|
.ratemask = BIT(0),
|
2008-02-03 15:50:40 +01:00
|
|
|
.plcp = 0x00,
|
|
|
|
},
|
|
|
|
{
|
2008-03-09 22:48:08 +01:00
|
|
|
.flags = DEV_RATE_CCK | DEV_RATE_SHORT_PREAMBLE | DEV_RATE_BASIC,
|
2008-02-03 15:50:40 +01:00
|
|
|
.bitrate = 20,
|
2008-03-09 22:48:08 +01:00
|
|
|
.ratemask = BIT(1),
|
2008-02-03 15:50:40 +01:00
|
|
|
.plcp = 0x01,
|
|
|
|
},
|
|
|
|
{
|
2008-03-09 22:48:08 +01:00
|
|
|
.flags = DEV_RATE_CCK | DEV_RATE_SHORT_PREAMBLE | DEV_RATE_BASIC,
|
2008-02-03 15:50:40 +01:00
|
|
|
.bitrate = 55,
|
2008-03-09 22:48:08 +01:00
|
|
|
.ratemask = BIT(2),
|
2008-02-03 15:50:40 +01:00
|
|
|
.plcp = 0x02,
|
|
|
|
},
|
|
|
|
{
|
2008-03-09 22:48:08 +01:00
|
|
|
.flags = DEV_RATE_CCK | DEV_RATE_SHORT_PREAMBLE | DEV_RATE_BASIC,
|
2008-02-03 15:50:40 +01:00
|
|
|
.bitrate = 110,
|
2008-03-09 22:48:08 +01:00
|
|
|
.ratemask = BIT(3),
|
2008-02-03 15:50:40 +01:00
|
|
|
.plcp = 0x03,
|
|
|
|
},
|
|
|
|
{
|
2008-03-09 22:48:08 +01:00
|
|
|
.flags = DEV_RATE_OFDM | DEV_RATE_BASIC,
|
2008-02-03 15:50:40 +01:00
|
|
|
.bitrate = 60,
|
2008-03-09 22:48:08 +01:00
|
|
|
.ratemask = BIT(4),
|
2008-02-03 15:50:40 +01:00
|
|
|
.plcp = 0x0b,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
.flags = DEV_RATE_OFDM,
|
|
|
|
.bitrate = 90,
|
2008-03-09 22:48:08 +01:00
|
|
|
.ratemask = BIT(5),
|
2008-02-03 15:50:40 +01:00
|
|
|
.plcp = 0x0f,
|
|
|
|
},
|
|
|
|
{
|
2008-03-09 22:48:08 +01:00
|
|
|
.flags = DEV_RATE_OFDM | DEV_RATE_BASIC,
|
2008-02-03 15:50:40 +01:00
|
|
|
.bitrate = 120,
|
2008-03-09 22:48:08 +01:00
|
|
|
.ratemask = BIT(6),
|
2008-02-03 15:50:40 +01:00
|
|
|
.plcp = 0x0a,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
.flags = DEV_RATE_OFDM,
|
|
|
|
.bitrate = 180,
|
2008-03-09 22:48:08 +01:00
|
|
|
.ratemask = BIT(7),
|
2008-02-03 15:50:40 +01:00
|
|
|
.plcp = 0x0e,
|
|
|
|
},
|
|
|
|
{
|
2008-03-09 22:48:08 +01:00
|
|
|
.flags = DEV_RATE_OFDM | DEV_RATE_BASIC,
|
2008-02-03 15:50:40 +01:00
|
|
|
.bitrate = 240,
|
2008-03-09 22:48:08 +01:00
|
|
|
.ratemask = BIT(8),
|
2008-02-03 15:50:40 +01:00
|
|
|
.plcp = 0x09,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
.flags = DEV_RATE_OFDM,
|
|
|
|
.bitrate = 360,
|
2008-03-09 22:48:08 +01:00
|
|
|
.ratemask = BIT(9),
|
2008-02-03 15:50:40 +01:00
|
|
|
.plcp = 0x0d,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
.flags = DEV_RATE_OFDM,
|
|
|
|
.bitrate = 480,
|
2008-03-09 22:48:08 +01:00
|
|
|
.ratemask = BIT(10),
|
2008-02-03 15:50:40 +01:00
|
|
|
.plcp = 0x08,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
.flags = DEV_RATE_OFDM,
|
|
|
|
.bitrate = 540,
|
2008-03-09 22:48:08 +01:00
|
|
|
.ratemask = BIT(11),
|
2008-02-03 15:50:40 +01:00
|
|
|
.plcp = 0x0c,
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
2007-09-26 02:57:13 +02:00
|
|
|
static void rt2x00lib_channel(struct ieee80211_channel *entry,
|
|
|
|
const int channel, const int tx_power,
|
|
|
|
const int value)
|
|
|
|
{
|
2008-02-03 15:52:45 +01:00
|
|
|
entry->center_freq = ieee80211_channel_to_frequency(channel);
|
2008-01-24 19:38:38 +01:00
|
|
|
entry->hw_value = value;
|
|
|
|
entry->max_power = tx_power;
|
|
|
|
entry->max_antenna_gain = 0xff;
|
2007-09-26 02:57:13 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void rt2x00lib_rate(struct ieee80211_rate *entry,
|
2008-02-03 15:50:40 +01:00
|
|
|
const u16 index, const struct rt2x00_rate *rate)
|
2007-09-26 02:57:13 +02:00
|
|
|
{
|
2008-02-03 15:50:40 +01:00
|
|
|
entry->flags = 0;
|
|
|
|
entry->bitrate = rate->bitrate;
|
|
|
|
entry->hw_value = rt2x00_create_rate_hw_value(index, 0);
|
2008-01-24 19:38:38 +01:00
|
|
|
entry->hw_value_short = entry->hw_value;
|
2008-02-03 15:50:40 +01:00
|
|
|
|
|
|
|
if (rate->flags & DEV_RATE_SHORT_PREAMBLE) {
|
|
|
|
entry->flags |= IEEE80211_RATE_SHORT_PREAMBLE;
|
|
|
|
entry->hw_value_short |= rt2x00_create_rate_hw_value(index, 1);
|
|
|
|
}
|
2007-09-26 02:57:13 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static int rt2x00lib_probe_hw_modes(struct rt2x00_dev *rt2x00dev,
|
|
|
|
struct hw_mode_spec *spec)
|
|
|
|
{
|
|
|
|
struct ieee80211_hw *hw = rt2x00dev->hw;
|
|
|
|
struct ieee80211_channel *channels;
|
|
|
|
struct ieee80211_rate *rates;
|
2008-02-17 17:35:05 +01:00
|
|
|
unsigned int num_rates;
|
2007-09-26 02:57:13 +02:00
|
|
|
unsigned int i;
|
|
|
|
unsigned char tx_power;
|
|
|
|
|
2008-02-17 17:35:05 +01:00
|
|
|
num_rates = 0;
|
|
|
|
if (spec->supported_rates & SUPPORT_RATE_CCK)
|
|
|
|
num_rates += 4;
|
|
|
|
if (spec->supported_rates & SUPPORT_RATE_OFDM)
|
|
|
|
num_rates += 8;
|
2007-09-26 02:57:13 +02:00
|
|
|
|
|
|
|
channels = kzalloc(sizeof(*channels) * spec->num_channels, GFP_KERNEL);
|
|
|
|
if (!channels)
|
2008-01-24 19:38:38 +01:00
|
|
|
return -ENOMEM;
|
2007-09-26 02:57:13 +02:00
|
|
|
|
2008-02-17 17:35:05 +01:00
|
|
|
rates = kzalloc(sizeof(*rates) * num_rates, GFP_KERNEL);
|
2007-09-26 02:57:13 +02:00
|
|
|
if (!rates)
|
|
|
|
goto exit_free_channels;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Initialize Rate list.
|
|
|
|
*/
|
2008-02-17 17:35:05 +01:00
|
|
|
for (i = 0; i < num_rates; i++)
|
2008-02-03 15:54:34 +01:00
|
|
|
rt2x00lib_rate(&rates[i], i, rt2x00_get_rate(i));
|
2007-09-26 02:57:13 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Initialize Channel list.
|
|
|
|
*/
|
|
|
|
for (i = 0; i < spec->num_channels; i++) {
|
2008-02-17 17:35:05 +01:00
|
|
|
if (spec->channels[i].channel <= 14) {
|
|
|
|
if (spec->tx_power_bg)
|
|
|
|
tx_power = spec->tx_power_bg[i];
|
|
|
|
else
|
|
|
|
tx_power = spec->tx_power_default;
|
|
|
|
} else {
|
|
|
|
if (spec->tx_power_a)
|
|
|
|
tx_power = spec->tx_power_a[i];
|
|
|
|
else
|
|
|
|
tx_power = spec->tx_power_default;
|
|
|
|
}
|
2007-09-26 02:57:13 +02:00
|
|
|
|
|
|
|
rt2x00lib_channel(&channels[i],
|
|
|
|
spec->channels[i].channel, tx_power, i);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2008-02-17 17:35:05 +01:00
|
|
|
* Intitialize 802.11b, 802.11g
|
2007-09-26 02:57:13 +02:00
|
|
|
* Rates: CCK, OFDM.
|
2008-01-24 19:38:38 +01:00
|
|
|
* Channels: 2.4 GHz
|
2007-09-26 02:57:13 +02:00
|
|
|
*/
|
2008-02-17 17:35:55 +01:00
|
|
|
if (spec->supported_bands & SUPPORT_BAND_2GHZ) {
|
2008-02-17 17:35:05 +01:00
|
|
|
rt2x00dev->bands[IEEE80211_BAND_2GHZ].n_channels = 14;
|
|
|
|
rt2x00dev->bands[IEEE80211_BAND_2GHZ].n_bitrates = num_rates;
|
|
|
|
rt2x00dev->bands[IEEE80211_BAND_2GHZ].channels = channels;
|
|
|
|
rt2x00dev->bands[IEEE80211_BAND_2GHZ].bitrates = rates;
|
|
|
|
hw->wiphy->bands[IEEE80211_BAND_2GHZ] =
|
|
|
|
&rt2x00dev->bands[IEEE80211_BAND_2GHZ];
|
2007-09-26 02:57:13 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Intitialize 802.11a
|
|
|
|
* Rates: OFDM.
|
|
|
|
* Channels: OFDM, UNII, HiperLAN2.
|
|
|
|
*/
|
2008-02-17 17:35:55 +01:00
|
|
|
if (spec->supported_bands & SUPPORT_BAND_5GHZ) {
|
2008-02-17 17:35:05 +01:00
|
|
|
rt2x00dev->bands[IEEE80211_BAND_5GHZ].n_channels =
|
|
|
|
spec->num_channels - 14;
|
|
|
|
rt2x00dev->bands[IEEE80211_BAND_5GHZ].n_bitrates =
|
|
|
|
num_rates - 4;
|
|
|
|
rt2x00dev->bands[IEEE80211_BAND_5GHZ].channels = &channels[14];
|
|
|
|
rt2x00dev->bands[IEEE80211_BAND_5GHZ].bitrates = &rates[4];
|
|
|
|
hw->wiphy->bands[IEEE80211_BAND_5GHZ] =
|
|
|
|
&rt2x00dev->bands[IEEE80211_BAND_5GHZ];
|
2007-09-26 02:57:13 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
2008-01-24 19:38:38 +01:00
|
|
|
exit_free_channels:
|
2007-09-26 02:57:13 +02:00
|
|
|
kfree(channels);
|
|
|
|
ERROR(rt2x00dev, "Allocation ieee80211 modes failed.\n");
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void rt2x00lib_remove_hw(struct rt2x00_dev *rt2x00dev)
|
|
|
|
{
|
2007-09-25 20:55:39 +02:00
|
|
|
if (test_bit(DEVICE_REGISTERED_HW, &rt2x00dev->flags))
|
2007-09-26 02:57:13 +02:00
|
|
|
ieee80211_unregister_hw(rt2x00dev->hw);
|
|
|
|
|
2008-01-24 19:38:38 +01:00
|
|
|
if (likely(rt2x00dev->hw->wiphy->bands[IEEE80211_BAND_2GHZ])) {
|
|
|
|
kfree(rt2x00dev->hw->wiphy->bands[IEEE80211_BAND_2GHZ]->channels);
|
|
|
|
kfree(rt2x00dev->hw->wiphy->bands[IEEE80211_BAND_2GHZ]->bitrates);
|
|
|
|
rt2x00dev->hw->wiphy->bands[IEEE80211_BAND_2GHZ] = NULL;
|
|
|
|
rt2x00dev->hw->wiphy->bands[IEEE80211_BAND_5GHZ] = NULL;
|
2007-09-26 02:57:13 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int rt2x00lib_probe_hw(struct rt2x00_dev *rt2x00dev)
|
|
|
|
{
|
|
|
|
struct hw_mode_spec *spec = &rt2x00dev->spec;
|
|
|
|
int status;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Initialize HW modes.
|
|
|
|
*/
|
|
|
|
status = rt2x00lib_probe_hw_modes(rt2x00dev, spec);
|
|
|
|
if (status)
|
|
|
|
return status;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Register HW.
|
|
|
|
*/
|
|
|
|
status = ieee80211_register_hw(rt2x00dev->hw);
|
|
|
|
if (status) {
|
|
|
|
rt2x00lib_remove_hw(rt2x00dev);
|
|
|
|
return status;
|
|
|
|
}
|
|
|
|
|
2007-09-25 20:55:39 +02:00
|
|
|
__set_bit(DEVICE_REGISTERED_HW, &rt2x00dev->flags);
|
2007-09-26 02:57:13 +02:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Initialization/uninitialization handlers.
|
|
|
|
*/
|
2008-01-06 23:40:07 +01:00
|
|
|
static void rt2x00lib_uninitialize(struct rt2x00_dev *rt2x00dev)
|
2007-09-26 02:57:13 +02:00
|
|
|
{
|
|
|
|
if (!__test_and_clear_bit(DEVICE_INITIALIZED, &rt2x00dev->flags))
|
|
|
|
return;
|
|
|
|
|
|
|
|
/*
|
2008-03-13 15:38:03 +01:00
|
|
|
* Unregister extra components.
|
2007-09-26 02:57:13 +02:00
|
|
|
*/
|
|
|
|
rt2x00rfkill_unregister(rt2x00dev);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Allow the HW to uninitialize.
|
|
|
|
*/
|
|
|
|
rt2x00dev->ops->lib->uninitialize(rt2x00dev);
|
|
|
|
|
|
|
|
/*
|
2008-02-05 22:42:23 +01:00
|
|
|
* Free allocated queue entries.
|
2007-09-26 02:57:13 +02:00
|
|
|
*/
|
2008-02-05 22:42:23 +01:00
|
|
|
rt2x00queue_uninitialize(rt2x00dev);
|
2007-09-26 02:57:13 +02:00
|
|
|
}
|
|
|
|
|
2008-01-06 23:40:07 +01:00
|
|
|
static int rt2x00lib_initialize(struct rt2x00_dev *rt2x00dev)
|
2007-09-26 02:57:13 +02:00
|
|
|
{
|
|
|
|
int status;
|
|
|
|
|
|
|
|
if (test_bit(DEVICE_INITIALIZED, &rt2x00dev->flags))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/*
|
2008-02-05 22:42:23 +01:00
|
|
|
* Allocate all queue entries.
|
2007-09-26 02:57:13 +02:00
|
|
|
*/
|
2008-02-05 22:42:23 +01:00
|
|
|
status = rt2x00queue_initialize(rt2x00dev);
|
|
|
|
if (status)
|
2007-09-26 02:57:13 +02:00
|
|
|
return status;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Initialize the device.
|
|
|
|
*/
|
|
|
|
status = rt2x00dev->ops->lib->initialize(rt2x00dev);
|
2008-05-05 17:23:47 +02:00
|
|
|
if (status) {
|
|
|
|
rt2x00queue_uninitialize(rt2x00dev);
|
|
|
|
return status;
|
|
|
|
}
|
2007-09-26 02:57:13 +02:00
|
|
|
|
|
|
|
__set_bit(DEVICE_INITIALIZED, &rt2x00dev->flags);
|
|
|
|
|
|
|
|
/*
|
2008-03-13 15:38:03 +01:00
|
|
|
* Register the extra components.
|
2007-09-26 02:57:13 +02:00
|
|
|
*/
|
2008-03-13 15:38:03 +01:00
|
|
|
rt2x00rfkill_register(rt2x00dev);
|
2007-09-26 02:57:13 +02:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-01-06 23:40:07 +01:00
|
|
|
int rt2x00lib_start(struct rt2x00_dev *rt2x00dev)
|
|
|
|
{
|
|
|
|
int retval;
|
|
|
|
|
|
|
|
if (test_bit(DEVICE_STARTED, &rt2x00dev->flags))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If this is the first interface which is added,
|
|
|
|
* we should load the firmware now.
|
|
|
|
*/
|
2008-02-03 15:48:38 +01:00
|
|
|
retval = rt2x00lib_load_firmware(rt2x00dev);
|
|
|
|
if (retval)
|
|
|
|
return retval;
|
2008-01-06 23:40:07 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Initialize the device.
|
|
|
|
*/
|
|
|
|
retval = rt2x00lib_initialize(rt2x00dev);
|
|
|
|
if (retval)
|
|
|
|
return retval;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Enable radio.
|
|
|
|
*/
|
|
|
|
retval = rt2x00lib_enable_radio(rt2x00dev);
|
|
|
|
if (retval) {
|
|
|
|
rt2x00lib_uninitialize(rt2x00dev);
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
rt2x00: Add per-interface structure
Rework the interface handling. Delete the interface structure
and replace it with a per-interface structure. This changes the
way rt2x00 handles the active interface drastically.
Copy ieee80211_bss_conf to the this rt2x00_intf structure during
the bss_info_changed() callback function. This will allow us to
reference it later, and removes the requirement for the device flag
SHORT_PREAMBLE flag which is interface specific.
Drivers receive the option to give the maximum number of virtual
interfaces the device can handle. Virtual interface support:
rt2400pci: 1 sta or 1 ap, * monitor interfaces
rt2500pci: 1 sta or 1 ap, * monitor interfaces
rt2500usb: 1 sta or 1 ap, * monitor interfaces
rt61pci: 1 sta or 4 ap, * monitor interfaces
rt73usb: 1 sta or 4 ap, * monitor interfaces
At the moment none of the drivers support AP and STA interfaces
simultaneously, this is a hardware limitation so future support
will be very unlikely.
Each interface structure receives its dedicated beacon entry,
with this we can easily work with beaconing while multiple master
mode interfaces are currently active.
The configuration handlers for the MAC, BSSID and type are
often called together since they all belong to the interface
configuration. Merge the 3 configuration calls and cleanup
the API between rt2x00lib and the drivers. While we are cleaning
up the interface configuration anyway, we might as well clean up
the configuration handler as well.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2008-02-03 15:49:59 +01:00
|
|
|
rt2x00dev->intf_ap_count = 0;
|
|
|
|
rt2x00dev->intf_sta_count = 0;
|
|
|
|
rt2x00dev->intf_associated = 0;
|
|
|
|
|
2008-01-06 23:40:07 +01:00
|
|
|
__set_bit(DEVICE_STARTED, &rt2x00dev->flags);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void rt2x00lib_stop(struct rt2x00_dev *rt2x00dev)
|
|
|
|
{
|
|
|
|
if (!test_bit(DEVICE_STARTED, &rt2x00dev->flags))
|
|
|
|
return;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Perhaps we can add something smarter here,
|
|
|
|
* but for now just disabling the radio should do.
|
|
|
|
*/
|
|
|
|
rt2x00lib_disable_radio(rt2x00dev);
|
|
|
|
|
rt2x00: Add per-interface structure
Rework the interface handling. Delete the interface structure
and replace it with a per-interface structure. This changes the
way rt2x00 handles the active interface drastically.
Copy ieee80211_bss_conf to the this rt2x00_intf structure during
the bss_info_changed() callback function. This will allow us to
reference it later, and removes the requirement for the device flag
SHORT_PREAMBLE flag which is interface specific.
Drivers receive the option to give the maximum number of virtual
interfaces the device can handle. Virtual interface support:
rt2400pci: 1 sta or 1 ap, * monitor interfaces
rt2500pci: 1 sta or 1 ap, * monitor interfaces
rt2500usb: 1 sta or 1 ap, * monitor interfaces
rt61pci: 1 sta or 4 ap, * monitor interfaces
rt73usb: 1 sta or 4 ap, * monitor interfaces
At the moment none of the drivers support AP and STA interfaces
simultaneously, this is a hardware limitation so future support
will be very unlikely.
Each interface structure receives its dedicated beacon entry,
with this we can easily work with beaconing while multiple master
mode interfaces are currently active.
The configuration handlers for the MAC, BSSID and type are
often called together since they all belong to the interface
configuration. Merge the 3 configuration calls and cleanup
the API between rt2x00lib and the drivers. While we are cleaning
up the interface configuration anyway, we might as well clean up
the configuration handler as well.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2008-02-03 15:49:59 +01:00
|
|
|
rt2x00dev->intf_ap_count = 0;
|
|
|
|
rt2x00dev->intf_sta_count = 0;
|
|
|
|
rt2x00dev->intf_associated = 0;
|
|
|
|
|
2008-01-06 23:40:07 +01:00
|
|
|
__clear_bit(DEVICE_STARTED, &rt2x00dev->flags);
|
|
|
|
}
|
|
|
|
|
2007-09-26 02:57:13 +02:00
|
|
|
/*
|
|
|
|
* driver allocation handlers.
|
|
|
|
*/
|
|
|
|
int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev)
|
|
|
|
{
|
|
|
|
int retval = -ENOMEM;
|
|
|
|
|
rt2x00: Add per-interface structure
Rework the interface handling. Delete the interface structure
and replace it with a per-interface structure. This changes the
way rt2x00 handles the active interface drastically.
Copy ieee80211_bss_conf to the this rt2x00_intf structure during
the bss_info_changed() callback function. This will allow us to
reference it later, and removes the requirement for the device flag
SHORT_PREAMBLE flag which is interface specific.
Drivers receive the option to give the maximum number of virtual
interfaces the device can handle. Virtual interface support:
rt2400pci: 1 sta or 1 ap, * monitor interfaces
rt2500pci: 1 sta or 1 ap, * monitor interfaces
rt2500usb: 1 sta or 1 ap, * monitor interfaces
rt61pci: 1 sta or 4 ap, * monitor interfaces
rt73usb: 1 sta or 4 ap, * monitor interfaces
At the moment none of the drivers support AP and STA interfaces
simultaneously, this is a hardware limitation so future support
will be very unlikely.
Each interface structure receives its dedicated beacon entry,
with this we can easily work with beaconing while multiple master
mode interfaces are currently active.
The configuration handlers for the MAC, BSSID and type are
often called together since they all belong to the interface
configuration. Merge the 3 configuration calls and cleanup
the API between rt2x00lib and the drivers. While we are cleaning
up the interface configuration anyway, we might as well clean up
the configuration handler as well.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2008-02-03 15:49:59 +01:00
|
|
|
/*
|
|
|
|
* Make room for rt2x00_intf inside the per-interface
|
|
|
|
* structure ieee80211_vif.
|
|
|
|
*/
|
|
|
|
rt2x00dev->hw->vif_data_size = sizeof(struct rt2x00_intf);
|
|
|
|
|
2007-09-26 02:57:13 +02:00
|
|
|
/*
|
|
|
|
* Let the driver probe the device to detect the capabilities.
|
|
|
|
*/
|
|
|
|
retval = rt2x00dev->ops->lib->probe_hw(rt2x00dev);
|
|
|
|
if (retval) {
|
|
|
|
ERROR(rt2x00dev, "Failed to allocate device.\n");
|
|
|
|
goto exit;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Initialize configuration work.
|
|
|
|
*/
|
rt2x00: Add per-interface structure
Rework the interface handling. Delete the interface structure
and replace it with a per-interface structure. This changes the
way rt2x00 handles the active interface drastically.
Copy ieee80211_bss_conf to the this rt2x00_intf structure during
the bss_info_changed() callback function. This will allow us to
reference it later, and removes the requirement for the device flag
SHORT_PREAMBLE flag which is interface specific.
Drivers receive the option to give the maximum number of virtual
interfaces the device can handle. Virtual interface support:
rt2400pci: 1 sta or 1 ap, * monitor interfaces
rt2500pci: 1 sta or 1 ap, * monitor interfaces
rt2500usb: 1 sta or 1 ap, * monitor interfaces
rt61pci: 1 sta or 4 ap, * monitor interfaces
rt73usb: 1 sta or 4 ap, * monitor interfaces
At the moment none of the drivers support AP and STA interfaces
simultaneously, this is a hardware limitation so future support
will be very unlikely.
Each interface structure receives its dedicated beacon entry,
with this we can easily work with beaconing while multiple master
mode interfaces are currently active.
The configuration handlers for the MAC, BSSID and type are
often called together since they all belong to the interface
configuration. Merge the 3 configuration calls and cleanup
the API between rt2x00lib and the drivers. While we are cleaning
up the interface configuration anyway, we might as well clean up
the configuration handler as well.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2008-02-03 15:49:59 +01:00
|
|
|
INIT_WORK(&rt2x00dev->intf_work, rt2x00lib_intf_scheduled);
|
[PATCH] mac80211: revamp interface and filter configuration
Drivers are currently supposed to keep track of monitor
interfaces if they allow so-called "hard" monitor, and
they are also supposed to keep track of multicast etc.
This patch changes that, replaces the set_multicast_list()
callback with a new configure_filter() callback that takes
filter flags (FIF_*) instead of interface flags (IFF_*).
For a driver, this means it should open the filter as much
as necessary to get all frames requested by the filter flags.
Accordingly, the filter flags are named "positively", e.g.
FIF_ALLMULTI.
Multicast filtering is a bit special in that drivers that
have no multicast address filters need to allow multicast
frames through when either the FIF_ALLMULTI flag is set or
when the mc_count value is positive.
At the same time, drivers are no longer notified about
monitor interfaces at all, this means they now need to
implement the start() and stop() callbacks and the new
change_filter_flags() callback. Also, the start()/stop()
ordering changed, start() is now called *before* any
add_interface() as it really should be, and stop() after
any remove_interface().
The patch also changes the behaviour of setting the bssid
to multicast for scanning when IEEE80211_HW_NO_PROBE_FILTERING
is set; the IEEE80211_HW_NO_PROBE_FILTERING flag is removed
and the filter flag FIF_BCN_PRBRESP_PROMISC introduced.
This is a lot more efficient for hardware like b43 that
supports it and other hardware can still set the BSSID
to all-ones.
Driver modifications by Johannes Berg (b43 & iwlwifi), Michael Wu
(rtl8187, adm8211, and p54), Larry Finger (b43legacy), and
Ivo van Doorn (rt2x00).
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Michael Wu <flamingice@sourmilk.net>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2007-09-17 07:29:23 +02:00
|
|
|
INIT_WORK(&rt2x00dev->filter_work, rt2x00lib_packetfilter_scheduled);
|
2007-09-26 02:57:13 +02:00
|
|
|
INIT_DELAYED_WORK(&rt2x00dev->link.work, rt2x00lib_link_tuner);
|
|
|
|
|
|
|
|
/*
|
2008-02-05 22:42:23 +01:00
|
|
|
* Allocate queue array.
|
2007-09-26 02:57:13 +02:00
|
|
|
*/
|
2008-02-05 22:42:23 +01:00
|
|
|
retval = rt2x00queue_allocate(rt2x00dev);
|
2007-09-26 02:57:13 +02:00
|
|
|
if (retval)
|
|
|
|
goto exit;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Initialize ieee80211 structure.
|
|
|
|
*/
|
|
|
|
retval = rt2x00lib_probe_hw(rt2x00dev);
|
|
|
|
if (retval) {
|
|
|
|
ERROR(rt2x00dev, "Failed to initialize hw.\n");
|
|
|
|
goto exit;
|
|
|
|
}
|
|
|
|
|
2008-02-03 15:53:40 +01:00
|
|
|
/*
|
2008-03-13 15:38:03 +01:00
|
|
|
* Register extra components.
|
2008-02-03 15:53:40 +01:00
|
|
|
*/
|
|
|
|
rt2x00leds_register(rt2x00dev);
|
2008-03-13 15:38:03 +01:00
|
|
|
rt2x00rfkill_allocate(rt2x00dev);
|
2007-09-26 02:57:13 +02:00
|
|
|
rt2x00debug_register(rt2x00dev);
|
|
|
|
|
2007-09-25 20:55:39 +02:00
|
|
|
__set_bit(DEVICE_PRESENT, &rt2x00dev->flags);
|
|
|
|
|
2007-09-26 02:57:13 +02:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
exit:
|
|
|
|
rt2x00lib_remove_dev(rt2x00dev);
|
|
|
|
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(rt2x00lib_probe_dev);
|
|
|
|
|
|
|
|
void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev)
|
|
|
|
{
|
2007-09-25 20:55:39 +02:00
|
|
|
__clear_bit(DEVICE_PRESENT, &rt2x00dev->flags);
|
|
|
|
|
2007-09-26 02:57:13 +02:00
|
|
|
/*
|
|
|
|
* Disable radio.
|
|
|
|
*/
|
|
|
|
rt2x00lib_disable_radio(rt2x00dev);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Uninitialize device.
|
|
|
|
*/
|
|
|
|
rt2x00lib_uninitialize(rt2x00dev);
|
|
|
|
|
|
|
|
/*
|
2008-03-13 15:38:03 +01:00
|
|
|
* Free extra components
|
2007-09-26 02:57:13 +02:00
|
|
|
*/
|
|
|
|
rt2x00debug_deregister(rt2x00dev);
|
|
|
|
rt2x00rfkill_free(rt2x00dev);
|
2008-02-03 15:53:40 +01:00
|
|
|
rt2x00leds_unregister(rt2x00dev);
|
|
|
|
|
2007-09-26 02:57:13 +02:00
|
|
|
/*
|
|
|
|
* Free ieee80211_hw memory.
|
|
|
|
*/
|
|
|
|
rt2x00lib_remove_hw(rt2x00dev);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Free firmware image.
|
|
|
|
*/
|
|
|
|
rt2x00lib_free_firmware(rt2x00dev);
|
|
|
|
|
|
|
|
/*
|
2008-02-05 22:42:23 +01:00
|
|
|
* Free queue structures.
|
2007-09-26 02:57:13 +02:00
|
|
|
*/
|
2008-02-05 22:42:23 +01:00
|
|
|
rt2x00queue_free(rt2x00dev);
|
2007-09-26 02:57:13 +02:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(rt2x00lib_remove_dev);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Device state handlers
|
|
|
|
*/
|
|
|
|
#ifdef CONFIG_PM
|
|
|
|
int rt2x00lib_suspend(struct rt2x00_dev *rt2x00dev, pm_message_t state)
|
|
|
|
{
|
|
|
|
int retval;
|
|
|
|
|
|
|
|
NOTICE(rt2x00dev, "Going to sleep.\n");
|
2007-09-25 20:55:39 +02:00
|
|
|
__clear_bit(DEVICE_PRESENT, &rt2x00dev->flags);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Only continue if mac80211 has open interfaces.
|
|
|
|
*/
|
|
|
|
if (!test_bit(DEVICE_STARTED, &rt2x00dev->flags))
|
|
|
|
goto exit;
|
2007-10-06 14:12:42 +02:00
|
|
|
__set_bit(DEVICE_STARTED_SUSPEND, &rt2x00dev->flags);
|
2007-09-26 02:57:13 +02:00
|
|
|
|
|
|
|
/*
|
2008-03-13 15:38:03 +01:00
|
|
|
* Disable radio.
|
2007-09-26 02:57:13 +02:00
|
|
|
*/
|
2008-01-06 23:40:07 +01:00
|
|
|
rt2x00lib_stop(rt2x00dev);
|
2007-09-26 02:57:13 +02:00
|
|
|
rt2x00lib_uninitialize(rt2x00dev);
|
2008-03-13 15:38:03 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Suspend/disable extra components.
|
|
|
|
*/
|
2008-02-03 15:53:40 +01:00
|
|
|
rt2x00leds_suspend(rt2x00dev);
|
2008-03-13 15:38:03 +01:00
|
|
|
rt2x00rfkill_suspend(rt2x00dev);
|
2007-09-26 02:57:13 +02:00
|
|
|
rt2x00debug_deregister(rt2x00dev);
|
|
|
|
|
2007-09-25 20:55:39 +02:00
|
|
|
exit:
|
2007-09-26 02:57:13 +02:00
|
|
|
/*
|
2008-03-27 17:15:24 +01:00
|
|
|
* Set device mode to sleep for power management,
|
|
|
|
* on some hardware this call seems to consistently fail.
|
|
|
|
* From the specifications it is hard to tell why it fails,
|
|
|
|
* and if this is a "bad thing".
|
|
|
|
* Overall it is safe to just ignore the failure and
|
|
|
|
* continue suspending. The only downside is that the
|
|
|
|
* device will not be in optimal power save mode, but with
|
|
|
|
* the radio and the other components already disabled the
|
|
|
|
* device is as good as disabled.
|
2007-09-26 02:57:13 +02:00
|
|
|
*/
|
|
|
|
retval = rt2x00dev->ops->lib->set_device_state(rt2x00dev, STATE_SLEEP);
|
|
|
|
if (retval)
|
2008-03-27 17:15:24 +01:00
|
|
|
WARNING(rt2x00dev, "Device failed to enter sleep state, "
|
|
|
|
"continue suspending.\n");
|
2007-09-26 02:57:13 +02:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(rt2x00lib_suspend);
|
|
|
|
|
rt2x00: Add per-interface structure
Rework the interface handling. Delete the interface structure
and replace it with a per-interface structure. This changes the
way rt2x00 handles the active interface drastically.
Copy ieee80211_bss_conf to the this rt2x00_intf structure during
the bss_info_changed() callback function. This will allow us to
reference it later, and removes the requirement for the device flag
SHORT_PREAMBLE flag which is interface specific.
Drivers receive the option to give the maximum number of virtual
interfaces the device can handle. Virtual interface support:
rt2400pci: 1 sta or 1 ap, * monitor interfaces
rt2500pci: 1 sta or 1 ap, * monitor interfaces
rt2500usb: 1 sta or 1 ap, * monitor interfaces
rt61pci: 1 sta or 4 ap, * monitor interfaces
rt73usb: 1 sta or 4 ap, * monitor interfaces
At the moment none of the drivers support AP and STA interfaces
simultaneously, this is a hardware limitation so future support
will be very unlikely.
Each interface structure receives its dedicated beacon entry,
with this we can easily work with beaconing while multiple master
mode interfaces are currently active.
The configuration handlers for the MAC, BSSID and type are
often called together since they all belong to the interface
configuration. Merge the 3 configuration calls and cleanup
the API between rt2x00lib and the drivers. While we are cleaning
up the interface configuration anyway, we might as well clean up
the configuration handler as well.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2008-02-03 15:49:59 +01:00
|
|
|
static void rt2x00lib_resume_intf(void *data, u8 *mac,
|
|
|
|
struct ieee80211_vif *vif)
|
|
|
|
{
|
|
|
|
struct rt2x00_dev *rt2x00dev = data;
|
|
|
|
struct rt2x00_intf *intf = vif_to_intf(vif);
|
|
|
|
|
|
|
|
spin_lock(&intf->lock);
|
|
|
|
|
|
|
|
rt2x00lib_config_intf(rt2x00dev, intf,
|
|
|
|
vif->type, intf->mac, intf->bssid);
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Master or Ad-hoc mode require a new beacon update.
|
|
|
|
*/
|
|
|
|
if (vif->type == IEEE80211_IF_TYPE_AP ||
|
|
|
|
vif->type == IEEE80211_IF_TYPE_IBSS)
|
|
|
|
intf->delayed_flags |= DELAYED_UPDATE_BEACON;
|
|
|
|
|
|
|
|
spin_unlock(&intf->lock);
|
|
|
|
}
|
|
|
|
|
2007-09-26 02:57:13 +02:00
|
|
|
int rt2x00lib_resume(struct rt2x00_dev *rt2x00dev)
|
|
|
|
{
|
|
|
|
int retval;
|
|
|
|
|
|
|
|
NOTICE(rt2x00dev, "Waking up.\n");
|
|
|
|
|
|
|
|
/*
|
2008-03-13 15:38:03 +01:00
|
|
|
* Restore/enable extra components.
|
2007-09-26 02:57:13 +02:00
|
|
|
*/
|
|
|
|
rt2x00debug_register(rt2x00dev);
|
2008-03-13 15:38:03 +01:00
|
|
|
rt2x00rfkill_resume(rt2x00dev);
|
2008-02-03 15:53:40 +01:00
|
|
|
rt2x00leds_resume(rt2x00dev);
|
2007-09-26 02:57:13 +02:00
|
|
|
|
2007-09-25 20:55:39 +02:00
|
|
|
/*
|
2007-10-06 14:12:42 +02:00
|
|
|
* Only continue if mac80211 had open interfaces.
|
2007-09-25 20:55:39 +02:00
|
|
|
*/
|
2007-10-06 14:12:42 +02:00
|
|
|
if (!__test_and_clear_bit(DEVICE_STARTED_SUSPEND, &rt2x00dev->flags))
|
2007-09-25 20:55:39 +02:00
|
|
|
return 0;
|
|
|
|
|
2007-09-26 02:57:13 +02:00
|
|
|
/*
|
|
|
|
* Reinitialize device and all active interfaces.
|
|
|
|
*/
|
2008-01-06 23:40:07 +01:00
|
|
|
retval = rt2x00lib_start(rt2x00dev);
|
2007-09-26 02:57:13 +02:00
|
|
|
if (retval)
|
|
|
|
goto exit;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Reconfigure device.
|
|
|
|
*/
|
2007-09-25 20:55:39 +02:00
|
|
|
rt2x00lib_config(rt2x00dev, &rt2x00dev->hw->conf, 1);
|
|
|
|
if (!rt2x00dev->hw->conf.radio_enabled)
|
|
|
|
rt2x00lib_disable_radio(rt2x00dev);
|
2007-09-26 02:57:13 +02:00
|
|
|
|
rt2x00: Add per-interface structure
Rework the interface handling. Delete the interface structure
and replace it with a per-interface structure. This changes the
way rt2x00 handles the active interface drastically.
Copy ieee80211_bss_conf to the this rt2x00_intf structure during
the bss_info_changed() callback function. This will allow us to
reference it later, and removes the requirement for the device flag
SHORT_PREAMBLE flag which is interface specific.
Drivers receive the option to give the maximum number of virtual
interfaces the device can handle. Virtual interface support:
rt2400pci: 1 sta or 1 ap, * monitor interfaces
rt2500pci: 1 sta or 1 ap, * monitor interfaces
rt2500usb: 1 sta or 1 ap, * monitor interfaces
rt61pci: 1 sta or 4 ap, * monitor interfaces
rt73usb: 1 sta or 4 ap, * monitor interfaces
At the moment none of the drivers support AP and STA interfaces
simultaneously, this is a hardware limitation so future support
will be very unlikely.
Each interface structure receives its dedicated beacon entry,
with this we can easily work with beaconing while multiple master
mode interfaces are currently active.
The configuration handlers for the MAC, BSSID and type are
often called together since they all belong to the interface
configuration. Merge the 3 configuration calls and cleanup
the API between rt2x00lib and the drivers. While we are cleaning
up the interface configuration anyway, we might as well clean up
the configuration handler as well.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2008-02-03 15:49:59 +01:00
|
|
|
/*
|
|
|
|
* Iterator over each active interface to
|
|
|
|
* reconfigure the hardware.
|
|
|
|
*/
|
|
|
|
ieee80211_iterate_active_interfaces(rt2x00dev->hw,
|
|
|
|
rt2x00lib_resume_intf, rt2x00dev);
|
2007-09-26 02:57:13 +02:00
|
|
|
|
2008-01-06 23:40:07 +01:00
|
|
|
/*
|
|
|
|
* We are ready again to receive requests from mac80211.
|
|
|
|
*/
|
|
|
|
__set_bit(DEVICE_PRESENT, &rt2x00dev->flags);
|
|
|
|
|
2007-09-25 20:55:39 +02:00
|
|
|
/*
|
|
|
|
* It is possible that during that mac80211 has attempted
|
|
|
|
* to send frames while we were suspending or resuming.
|
|
|
|
* In that case we have disabled the TX queue and should
|
|
|
|
* now enable it again
|
|
|
|
*/
|
|
|
|
ieee80211_start_queues(rt2x00dev->hw);
|
|
|
|
|
2007-09-26 02:57:13 +02:00
|
|
|
/*
|
rt2x00: Add per-interface structure
Rework the interface handling. Delete the interface structure
and replace it with a per-interface structure. This changes the
way rt2x00 handles the active interface drastically.
Copy ieee80211_bss_conf to the this rt2x00_intf structure during
the bss_info_changed() callback function. This will allow us to
reference it later, and removes the requirement for the device flag
SHORT_PREAMBLE flag which is interface specific.
Drivers receive the option to give the maximum number of virtual
interfaces the device can handle. Virtual interface support:
rt2400pci: 1 sta or 1 ap, * monitor interfaces
rt2500pci: 1 sta or 1 ap, * monitor interfaces
rt2500usb: 1 sta or 1 ap, * monitor interfaces
rt61pci: 1 sta or 4 ap, * monitor interfaces
rt73usb: 1 sta or 4 ap, * monitor interfaces
At the moment none of the drivers support AP and STA interfaces
simultaneously, this is a hardware limitation so future support
will be very unlikely.
Each interface structure receives its dedicated beacon entry,
with this we can easily work with beaconing while multiple master
mode interfaces are currently active.
The configuration handlers for the MAC, BSSID and type are
often called together since they all belong to the interface
configuration. Merge the 3 configuration calls and cleanup
the API between rt2x00lib and the drivers. While we are cleaning
up the interface configuration anyway, we might as well clean up
the configuration handler as well.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2008-02-03 15:49:59 +01:00
|
|
|
* During interface iteration we might have changed the
|
|
|
|
* delayed_flags, time to handles the event by calling
|
|
|
|
* the work handler directly.
|
2007-09-26 02:57:13 +02:00
|
|
|
*/
|
rt2x00: Add per-interface structure
Rework the interface handling. Delete the interface structure
and replace it with a per-interface structure. This changes the
way rt2x00 handles the active interface drastically.
Copy ieee80211_bss_conf to the this rt2x00_intf structure during
the bss_info_changed() callback function. This will allow us to
reference it later, and removes the requirement for the device flag
SHORT_PREAMBLE flag which is interface specific.
Drivers receive the option to give the maximum number of virtual
interfaces the device can handle. Virtual interface support:
rt2400pci: 1 sta or 1 ap, * monitor interfaces
rt2500pci: 1 sta or 1 ap, * monitor interfaces
rt2500usb: 1 sta or 1 ap, * monitor interfaces
rt61pci: 1 sta or 4 ap, * monitor interfaces
rt73usb: 1 sta or 4 ap, * monitor interfaces
At the moment none of the drivers support AP and STA interfaces
simultaneously, this is a hardware limitation so future support
will be very unlikely.
Each interface structure receives its dedicated beacon entry,
with this we can easily work with beaconing while multiple master
mode interfaces are currently active.
The configuration handlers for the MAC, BSSID and type are
often called together since they all belong to the interface
configuration. Merge the 3 configuration calls and cleanup
the API between rt2x00lib and the drivers. While we are cleaning
up the interface configuration anyway, we might as well clean up
the configuration handler as well.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2008-02-03 15:49:59 +01:00
|
|
|
rt2x00lib_intf_scheduled(&rt2x00dev->intf_work);
|
2007-09-26 02:57:13 +02:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
exit:
|
|
|
|
rt2x00lib_disable_radio(rt2x00dev);
|
|
|
|
rt2x00lib_uninitialize(rt2x00dev);
|
|
|
|
rt2x00debug_deregister(rt2x00dev);
|
|
|
|
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(rt2x00lib_resume);
|
|
|
|
#endif /* CONFIG_PM */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* rt2x00lib module information.
|
|
|
|
*/
|
|
|
|
MODULE_AUTHOR(DRV_PROJECT);
|
|
|
|
MODULE_VERSION(DRV_VERSION);
|
|
|
|
MODULE_DESCRIPTION("rt2x00 library");
|
|
|
|
MODULE_LICENSE("GPL");
|