6bb40dd13b
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>
142 lines
4.0 KiB
C
142 lines
4.0 KiB
C
/*
|
|
Copyright (C) 2004 - 2008 rt2x00 SourceForge Project
|
|
<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: Data structures and definitions for the rt2x00lib module.
|
|
*/
|
|
|
|
#ifndef RT2X00LIB_H
|
|
#define RT2X00LIB_H
|
|
|
|
/*
|
|
* Interval defines
|
|
* Both the link tuner as the rfkill will be called once per second.
|
|
*/
|
|
#define LINK_TUNE_INTERVAL ( round_jiffies_relative(HZ) )
|
|
#define RFKILL_POLL_INTERVAL ( 1000 )
|
|
|
|
/*
|
|
* Radio control handlers.
|
|
*/
|
|
int rt2x00lib_enable_radio(struct rt2x00_dev *rt2x00dev);
|
|
void rt2x00lib_disable_radio(struct rt2x00_dev *rt2x00dev);
|
|
void rt2x00lib_toggle_rx(struct rt2x00_dev *rt2x00dev, enum dev_state state);
|
|
void rt2x00lib_reset_link_tuner(struct rt2x00_dev *rt2x00dev);
|
|
|
|
/*
|
|
* Initialization handlers.
|
|
*/
|
|
int rt2x00lib_start(struct rt2x00_dev *rt2x00dev);
|
|
void rt2x00lib_stop(struct rt2x00_dev *rt2x00dev);
|
|
|
|
/*
|
|
* Configuration handlers.
|
|
*/
|
|
void rt2x00lib_config_intf(struct rt2x00_dev *rt2x00dev,
|
|
struct rt2x00_intf *intf,
|
|
enum ieee80211_if_types type,
|
|
u8 *mac, u8 *bssid);
|
|
void rt2x00lib_config_preamble(struct rt2x00_dev *rt2x00dev,
|
|
struct rt2x00_intf *intf,
|
|
const unsigned int short_preamble);
|
|
void rt2x00lib_config_antenna(struct rt2x00_dev *rt2x00dev,
|
|
enum antenna rx, enum antenna tx);
|
|
void rt2x00lib_config(struct rt2x00_dev *rt2x00dev,
|
|
struct ieee80211_conf *conf, const int force_config);
|
|
|
|
/*
|
|
* Queue handlers.
|
|
*/
|
|
void rt2x00queue_init_rx(struct rt2x00_dev *rt2x00dev);
|
|
void rt2x00queue_init_tx(struct rt2x00_dev *rt2x00dev);
|
|
int rt2x00queue_initialize(struct rt2x00_dev *rt2x00dev);
|
|
void rt2x00queue_uninitialize(struct rt2x00_dev *rt2x00dev);
|
|
int rt2x00queue_allocate(struct rt2x00_dev *rt2x00dev);
|
|
void rt2x00queue_free(struct rt2x00_dev *rt2x00dev);
|
|
|
|
/*
|
|
* Firmware handlers.
|
|
*/
|
|
#ifdef CONFIG_RT2X00_LIB_FIRMWARE
|
|
int rt2x00lib_load_firmware(struct rt2x00_dev *rt2x00dev);
|
|
void rt2x00lib_free_firmware(struct rt2x00_dev *rt2x00dev);
|
|
#else
|
|
static inline int rt2x00lib_load_firmware(struct rt2x00_dev *rt2x00dev)
|
|
{
|
|
return 0;
|
|
}
|
|
static inline void rt2x00lib_free_firmware(struct rt2x00_dev *rt2x00dev)
|
|
{
|
|
}
|
|
#endif /* CONFIG_RT2X00_LIB_FIRMWARE */
|
|
|
|
/*
|
|
* Debugfs handlers.
|
|
*/
|
|
#ifdef CONFIG_RT2X00_LIB_DEBUGFS
|
|
void rt2x00debug_register(struct rt2x00_dev *rt2x00dev);
|
|
void rt2x00debug_deregister(struct rt2x00_dev *rt2x00dev);
|
|
void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev, struct sk_buff *skb);
|
|
#else
|
|
static inline void rt2x00debug_register(struct rt2x00_dev *rt2x00dev)
|
|
{
|
|
}
|
|
|
|
static inline void rt2x00debug_deregister(struct rt2x00_dev *rt2x00dev)
|
|
{
|
|
}
|
|
|
|
static inline void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev,
|
|
struct sk_buff *skb)
|
|
{
|
|
}
|
|
#endif /* CONFIG_RT2X00_LIB_DEBUGFS */
|
|
|
|
/*
|
|
* RFkill handlers.
|
|
*/
|
|
#ifdef CONFIG_RT2X00_LIB_RFKILL
|
|
int rt2x00rfkill_register(struct rt2x00_dev *rt2x00dev);
|
|
void rt2x00rfkill_unregister(struct rt2x00_dev *rt2x00dev);
|
|
int rt2x00rfkill_allocate(struct rt2x00_dev *rt2x00dev);
|
|
void rt2x00rfkill_free(struct rt2x00_dev *rt2x00dev);
|
|
#else
|
|
static inline int rt2x00rfkill_register(struct rt2x00_dev *rt2x00dev)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline void rt2x00rfkill_unregister(struct rt2x00_dev *rt2x00dev)
|
|
{
|
|
}
|
|
|
|
static inline int rt2x00rfkill_allocate(struct rt2x00_dev *rt2x00dev)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline void rt2x00rfkill_free(struct rt2x00_dev *rt2x00dev)
|
|
{
|
|
}
|
|
#endif /* CONFIG_RT2X00_LIB_RFKILL */
|
|
|
|
#endif /* RT2X00LIB_H */
|