2007-09-25 18:57:13 -06:00
|
|
|
/*
|
2008-02-03 07:42:53 -07:00
|
|
|
Copyright (C) 2004 - 2008 rt2x00 SourceForge Project
|
2007-09-25 18:57:13 -06: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: rt2x00mac
|
|
|
|
Abstract: rt2x00 generic mac80211 routines.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/module.h>
|
|
|
|
|
|
|
|
#include "rt2x00.h"
|
|
|
|
#include "rt2x00lib.h"
|
|
|
|
|
|
|
|
static int rt2x00mac_tx_rts_cts(struct rt2x00_dev *rt2x00dev,
|
2008-02-05 14:42:23 -07:00
|
|
|
struct data_queue *queue,
|
2007-09-25 18:57:13 -06:00
|
|
|
struct sk_buff *frag_skb,
|
|
|
|
struct ieee80211_tx_control *control)
|
|
|
|
{
|
2008-02-17 09:32:08 -07:00
|
|
|
struct skb_frame_desc *skbdesc;
|
2007-09-25 18:57:13 -06:00
|
|
|
struct sk_buff *skb;
|
|
|
|
int size;
|
|
|
|
|
|
|
|
if (control->flags & IEEE80211_TXCTL_USE_CTS_PROTECT)
|
|
|
|
size = sizeof(struct ieee80211_cts);
|
|
|
|
else
|
|
|
|
size = sizeof(struct ieee80211_rts);
|
|
|
|
|
|
|
|
skb = dev_alloc_skb(size + rt2x00dev->hw->extra_tx_headroom);
|
|
|
|
if (!skb) {
|
|
|
|
WARNING(rt2x00dev, "Failed to create RTS/CTS frame.\n");
|
|
|
|
return NETDEV_TX_BUSY;
|
|
|
|
}
|
|
|
|
|
|
|
|
skb_reserve(skb, rt2x00dev->hw->extra_tx_headroom);
|
|
|
|
skb_put(skb, size);
|
|
|
|
|
|
|
|
if (control->flags & IEEE80211_TXCTL_USE_CTS_PROTECT)
|
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 07:49:59 -07:00
|
|
|
ieee80211_ctstoself_get(rt2x00dev->hw, control->vif,
|
2007-09-25 18:57:13 -06:00
|
|
|
frag_skb->data, frag_skb->len, control,
|
|
|
|
(struct ieee80211_cts *)(skb->data));
|
|
|
|
else
|
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 07:49:59 -07:00
|
|
|
ieee80211_rts_get(rt2x00dev->hw, control->vif,
|
2007-09-25 18:57:13 -06:00
|
|
|
frag_skb->data, frag_skb->len, control,
|
|
|
|
(struct ieee80211_rts *)(skb->data));
|
|
|
|
|
2008-02-17 09:32:08 -07:00
|
|
|
/*
|
|
|
|
* Initialize skb descriptor
|
|
|
|
*/
|
|
|
|
skbdesc = get_skb_frame_desc(skb);
|
|
|
|
memset(skbdesc, 0, sizeof(*skbdesc));
|
|
|
|
skbdesc->flags |= FRAME_DESC_DRIVER_GENERATED;
|
|
|
|
|
2008-02-05 14:42:23 -07:00
|
|
|
if (rt2x00dev->ops->lib->write_tx_data(rt2x00dev, queue, skb, control)) {
|
2007-09-25 18:57:13 -06:00
|
|
|
WARNING(rt2x00dev, "Failed to send RTS/CTS frame.\n");
|
|
|
|
return NETDEV_TX_BUSY;
|
|
|
|
}
|
|
|
|
|
|
|
|
return NETDEV_TX_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
int rt2x00mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb,
|
|
|
|
struct ieee80211_tx_control *control)
|
|
|
|
{
|
|
|
|
struct rt2x00_dev *rt2x00dev = hw->priv;
|
|
|
|
struct ieee80211_hdr *ieee80211hdr = (struct ieee80211_hdr *)skb->data;
|
2008-02-05 14:42:23 -07:00
|
|
|
struct data_queue *queue;
|
2008-02-17 09:32:08 -07:00
|
|
|
struct skb_frame_desc *skbdesc;
|
2007-09-25 18:57:13 -06:00
|
|
|
u16 frame_control;
|
|
|
|
|
2007-09-25 12:55:39 -06:00
|
|
|
/*
|
|
|
|
* Mac80211 might be calling this function while we are trying
|
|
|
|
* to remove the device or perhaps suspending it.
|
|
|
|
* Note that we can only stop the TX queues inside the TX path
|
|
|
|
* due to possible race conditions in mac80211.
|
|
|
|
*/
|
|
|
|
if (!test_bit(DEVICE_PRESENT, &rt2x00dev->flags)) {
|
|
|
|
ieee80211_stop_queues(hw);
|
2008-01-06 15:38:34 -07:00
|
|
|
return NETDEV_TX_OK;
|
2007-09-25 12:55:39 -06:00
|
|
|
}
|
|
|
|
|
2007-09-25 18:57:13 -06:00
|
|
|
/*
|
2008-02-05 14:42:23 -07:00
|
|
|
* Determine which queue to put packet on.
|
2007-09-25 18:57:13 -06:00
|
|
|
*/
|
2008-02-05 14:42:23 -07:00
|
|
|
queue = rt2x00queue_get_queue(rt2x00dev, control->queue);
|
|
|
|
if (unlikely(!queue)) {
|
2007-09-25 18:57:13 -06:00
|
|
|
ERROR(rt2x00dev,
|
|
|
|
"Attempt to send packet over invalid queue %d.\n"
|
|
|
|
"Please file bug report to %s.\n",
|
|
|
|
control->queue, DRV_PROJECT);
|
|
|
|
dev_kfree_skb_any(skb);
|
|
|
|
return NETDEV_TX_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If CTS/RTS is required. and this frame is not CTS or RTS,
|
|
|
|
* create and queue that frame first. But make sure we have
|
|
|
|
* at least enough entries available to send this CTS/RTS
|
|
|
|
* frame as well as the data frame.
|
|
|
|
*/
|
|
|
|
frame_control = le16_to_cpu(ieee80211hdr->frame_control);
|
|
|
|
if (!is_rts_frame(frame_control) && !is_cts_frame(frame_control) &&
|
|
|
|
(control->flags & (IEEE80211_TXCTL_USE_RTS_CTS |
|
|
|
|
IEEE80211_TXCTL_USE_CTS_PROTECT))) {
|
2008-02-05 14:42:23 -07:00
|
|
|
if (rt2x00queue_available(queue) <= 1) {
|
2008-01-06 15:38:34 -07:00
|
|
|
ieee80211_stop_queue(rt2x00dev->hw, control->queue);
|
2007-09-25 18:57:13 -06:00
|
|
|
return NETDEV_TX_BUSY;
|
2008-01-06 15:38:34 -07:00
|
|
|
}
|
2007-09-25 18:57:13 -06:00
|
|
|
|
2008-02-05 14:42:23 -07:00
|
|
|
if (rt2x00mac_tx_rts_cts(rt2x00dev, queue, skb, control)) {
|
2008-01-06 15:38:34 -07:00
|
|
|
ieee80211_stop_queue(rt2x00dev->hw, control->queue);
|
2007-09-25 18:57:13 -06:00
|
|
|
return NETDEV_TX_BUSY;
|
2008-01-06 15:38:34 -07:00
|
|
|
}
|
2007-09-25 18:57:13 -06:00
|
|
|
}
|
|
|
|
|
2008-02-17 09:32:08 -07:00
|
|
|
/*
|
|
|
|
* Initialize skb descriptor
|
|
|
|
*/
|
|
|
|
skbdesc = get_skb_frame_desc(skb);
|
|
|
|
memset(skbdesc, 0, sizeof(*skbdesc));
|
|
|
|
|
2008-02-05 14:42:23 -07:00
|
|
|
if (rt2x00dev->ops->lib->write_tx_data(rt2x00dev, queue, skb, control)) {
|
2008-01-06 15:38:34 -07:00
|
|
|
ieee80211_stop_queue(rt2x00dev->hw, control->queue);
|
2007-09-25 18:57:13 -06:00
|
|
|
return NETDEV_TX_BUSY;
|
2008-01-06 15:38:34 -07:00
|
|
|
}
|
|
|
|
|
2008-02-05 14:42:23 -07:00
|
|
|
if (rt2x00queue_full(queue))
|
2008-01-06 15:38:34 -07:00
|
|
|
ieee80211_stop_queue(rt2x00dev->hw, control->queue);
|
2007-09-25 18:57:13 -06:00
|
|
|
|
|
|
|
if (rt2x00dev->ops->lib->kick_tx_queue)
|
|
|
|
rt2x00dev->ops->lib->kick_tx_queue(rt2x00dev, control->queue);
|
|
|
|
|
|
|
|
return NETDEV_TX_OK;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(rt2x00mac_tx);
|
|
|
|
|
|
|
|
int rt2x00mac_start(struct ieee80211_hw *hw)
|
|
|
|
{
|
|
|
|
struct rt2x00_dev *rt2x00dev = hw->priv;
|
|
|
|
|
2008-01-06 15:40:07 -07:00
|
|
|
if (!test_bit(DEVICE_PRESENT, &rt2x00dev->flags))
|
2007-09-25 18:57:13 -06:00
|
|
|
return 0;
|
|
|
|
|
2008-01-06 15:40:07 -07:00
|
|
|
return rt2x00lib_start(rt2x00dev);
|
2007-09-25 18:57:13 -06:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(rt2x00mac_start);
|
|
|
|
|
|
|
|
void rt2x00mac_stop(struct ieee80211_hw *hw)
|
|
|
|
{
|
|
|
|
struct rt2x00_dev *rt2x00dev = hw->priv;
|
|
|
|
|
2007-09-25 12:55:39 -06:00
|
|
|
if (!test_bit(DEVICE_PRESENT, &rt2x00dev->flags))
|
|
|
|
return;
|
|
|
|
|
2008-01-06 15:40:07 -07:00
|
|
|
rt2x00lib_stop(rt2x00dev);
|
2007-09-25 18:57:13 -06:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(rt2x00mac_stop);
|
|
|
|
|
|
|
|
int rt2x00mac_add_interface(struct ieee80211_hw *hw,
|
|
|
|
struct ieee80211_if_init_conf *conf)
|
|
|
|
{
|
|
|
|
struct rt2x00_dev *rt2x00dev = hw->priv;
|
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 07:49:59 -07:00
|
|
|
struct rt2x00_intf *intf = vif_to_intf(conf->vif);
|
|
|
|
struct data_queue *queue =
|
2008-02-03 07:54:57 -07:00
|
|
|
rt2x00queue_get_queue(rt2x00dev, RT2X00_BCN_QUEUE_BEACON);
|
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 07:49:59 -07:00
|
|
|
struct queue_entry *entry = NULL;
|
|
|
|
unsigned int i;
|
2007-09-25 18:57:13 -06: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 07:49:59 -07:00
|
|
|
* Don't allow interfaces to be added
|
|
|
|
* the device has disappeared.
|
2007-09-25 18:57:13 -06:00
|
|
|
*/
|
2007-09-25 12:55:39 -06:00
|
|
|
if (!test_bit(DEVICE_PRESENT, &rt2x00dev->flags) ||
|
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 07:49:59 -07:00
|
|
|
!test_bit(DEVICE_STARTED, &rt2x00dev->flags))
|
|
|
|
return -ENODEV;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* When we don't support mixed interfaces (a combination
|
|
|
|
* of sta and ap virtual interfaces) then we can only
|
|
|
|
* add this interface when the rival interface count is 0.
|
|
|
|
*/
|
|
|
|
if (!test_bit(DRIVER_SUPPORT_MIXED_INTERFACES, &rt2x00dev->flags) &&
|
|
|
|
((conf->type == IEEE80211_IF_TYPE_AP && rt2x00dev->intf_sta_count) ||
|
|
|
|
(conf->type != IEEE80211_IF_TYPE_AP && rt2x00dev->intf_ap_count)))
|
|
|
|
return -ENOBUFS;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Check if we exceeded the maximum amount of supported interfaces.
|
|
|
|
*/
|
|
|
|
if ((conf->type == IEEE80211_IF_TYPE_AP &&
|
|
|
|
rt2x00dev->intf_ap_count >= rt2x00dev->ops->max_ap_intf) ||
|
|
|
|
(conf->type != IEEE80211_IF_TYPE_AP &&
|
|
|
|
rt2x00dev->intf_sta_count >= rt2x00dev->ops->max_sta_intf))
|
|
|
|
return -ENOBUFS;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Loop through all beacon queues to find a free
|
|
|
|
* entry. Since there are as much beacon entries
|
|
|
|
* as the maximum interfaces, this search shouldn't
|
|
|
|
* fail.
|
|
|
|
*/
|
|
|
|
for (i = 0; i < queue->limit; i++) {
|
|
|
|
entry = &queue->entries[i];
|
|
|
|
if (!__test_and_set_bit(ENTRY_BCN_ASSIGNED, &entry->flags))
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (unlikely(i == queue->limit))
|
2007-09-25 18:57:13 -06:00
|
|
|
return -ENOBUFS;
|
|
|
|
|
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 07:49:59 -07:00
|
|
|
/*
|
|
|
|
* We are now absolutely sure the interface can be created,
|
|
|
|
* increase interface count and start initialization.
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (conf->type == IEEE80211_IF_TYPE_AP)
|
|
|
|
rt2x00dev->intf_ap_count++;
|
|
|
|
else
|
|
|
|
rt2x00dev->intf_sta_count++;
|
|
|
|
|
|
|
|
spin_lock_init(&intf->lock);
|
|
|
|
intf->beacon = entry;
|
|
|
|
|
[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-16 23:29:23 -06:00
|
|
|
if (conf->type == IEEE80211_IF_TYPE_AP)
|
|
|
|
memcpy(&intf->bssid, conf->mac_addr, ETH_ALEN);
|
|
|
|
memcpy(&intf->mac, conf->mac_addr, ETH_ALEN);
|
2007-09-25 18:57:13 -06:00
|
|
|
|
|
|
|
/*
|
|
|
|
* The MAC adddress must be configured after the device
|
[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-16 23:29:23 -06:00
|
|
|
* has been initialized. Otherwise the device can reset
|
|
|
|
* the MAC registers.
|
2007-09-25 18:57:13 -06: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 07:49:59 -07:00
|
|
|
rt2x00lib_config_intf(rt2x00dev, intf, conf->type, intf->mac, NULL);
|
2007-09-25 18:57:13 -06:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(rt2x00mac_add_interface);
|
|
|
|
|
|
|
|
void rt2x00mac_remove_interface(struct ieee80211_hw *hw,
|
|
|
|
struct ieee80211_if_init_conf *conf)
|
|
|
|
{
|
|
|
|
struct rt2x00_dev *rt2x00dev = hw->priv;
|
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 07:49:59 -07:00
|
|
|
struct rt2x00_intf *intf = vif_to_intf(conf->vif);
|
2007-09-25 18:57:13 -06:00
|
|
|
|
|
|
|
/*
|
2007-09-25 12:55:39 -06:00
|
|
|
* Don't allow interfaces to be remove while
|
|
|
|
* either the device has disappeared or when
|
|
|
|
* no interface is present.
|
2007-09-25 18:57:13 -06:00
|
|
|
*/
|
2007-09-25 12:55:39 -06:00
|
|
|
if (!test_bit(DEVICE_PRESENT, &rt2x00dev->flags) ||
|
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 07:49:59 -07:00
|
|
|
(conf->type == IEEE80211_IF_TYPE_AP && !rt2x00dev->intf_ap_count) ||
|
|
|
|
(conf->type != IEEE80211_IF_TYPE_AP && !rt2x00dev->intf_sta_count))
|
2007-09-25 18:57:13 -06: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 07:49:59 -07:00
|
|
|
if (conf->type == IEEE80211_IF_TYPE_AP)
|
|
|
|
rt2x00dev->intf_ap_count--;
|
|
|
|
else
|
|
|
|
rt2x00dev->intf_sta_count--;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Release beacon entry so it is available for
|
|
|
|
* new interfaces again.
|
|
|
|
*/
|
|
|
|
__clear_bit(ENTRY_BCN_ASSIGNED, &intf->beacon->flags);
|
2007-09-25 18:57:13 -06:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Make sure the bssid and mac address registers
|
|
|
|
* are cleared to prevent false ACKing of frames.
|
|
|
|
*/
|
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 07:49:59 -07:00
|
|
|
rt2x00lib_config_intf(rt2x00dev, intf,
|
|
|
|
IEEE80211_IF_TYPE_INVALID, NULL, NULL);
|
2007-09-25 18:57:13 -06:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(rt2x00mac_remove_interface);
|
|
|
|
|
|
|
|
int rt2x00mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf)
|
|
|
|
{
|
|
|
|
struct rt2x00_dev *rt2x00dev = hw->priv;
|
|
|
|
|
|
|
|
/*
|
2007-09-25 12:55:39 -06:00
|
|
|
* Mac80211 might be calling this function while we are trying
|
|
|
|
* to remove the device or perhaps suspending it.
|
2007-09-25 18:57:13 -06:00
|
|
|
*/
|
2007-09-25 12:55:39 -06:00
|
|
|
if (!test_bit(DEVICE_PRESENT, &rt2x00dev->flags))
|
2007-09-25 18:57:13 -06:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Check if we need to disable the radio,
|
|
|
|
* if this is not the case, at least the RX must be disabled.
|
|
|
|
*/
|
|
|
|
if (test_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags)) {
|
|
|
|
if (!conf->radio_enabled)
|
|
|
|
rt2x00lib_disable_radio(rt2x00dev);
|
|
|
|
else
|
2007-10-06 06:16:09 -06:00
|
|
|
rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_OFF);
|
2007-09-25 18:57:13 -06:00
|
|
|
}
|
|
|
|
|
2007-09-25 12:55:39 -06:00
|
|
|
rt2x00lib_config(rt2x00dev, conf, 0);
|
2007-09-25 18:57:13 -06:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Reenable RX only if the radio should be on.
|
|
|
|
*/
|
|
|
|
if (test_bit(DEVICE_ENABLED_RADIO, &rt2x00dev->flags))
|
2007-10-06 06:16:09 -06:00
|
|
|
rt2x00lib_toggle_rx(rt2x00dev, STATE_RADIO_RX_ON);
|
2007-09-25 18:57:13 -06:00
|
|
|
else if (conf->radio_enabled)
|
|
|
|
return rt2x00lib_enable_radio(rt2x00dev);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(rt2x00mac_config);
|
|
|
|
|
2007-12-18 17:31:26 -07:00
|
|
|
int rt2x00mac_config_interface(struct ieee80211_hw *hw,
|
|
|
|
struct ieee80211_vif *vif,
|
2007-09-25 18:57:13 -06:00
|
|
|
struct ieee80211_if_conf *conf)
|
|
|
|
{
|
|
|
|
struct rt2x00_dev *rt2x00dev = hw->priv;
|
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 07:49:59 -07:00
|
|
|
struct rt2x00_intf *intf = vif_to_intf(vif);
|
2007-09-25 18:57:13 -06:00
|
|
|
int status;
|
|
|
|
|
|
|
|
/*
|
2007-09-25 12:55:39 -06:00
|
|
|
* Mac80211 might be calling this function while we are trying
|
|
|
|
* to remove the device or perhaps suspending it.
|
2007-09-25 18:57:13 -06:00
|
|
|
*/
|
2007-09-25 12:55:39 -06:00
|
|
|
if (!test_bit(DEVICE_PRESENT, &rt2x00dev->flags))
|
2007-09-25 18:57:13 -06:00
|
|
|
return 0;
|
|
|
|
|
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 07:49:59 -07:00
|
|
|
spin_lock(&intf->lock);
|
2007-09-25 18:57:13 -06:00
|
|
|
|
|
|
|
/*
|
|
|
|
* If the interface does not work in master mode,
|
|
|
|
* then the bssid value in the interface structure
|
|
|
|
* should now be set.
|
|
|
|
*/
|
|
|
|
if (conf->type != IEEE80211_IF_TYPE_AP)
|
|
|
|
memcpy(&intf->bssid, conf->bssid, ETH_ALEN);
|
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 07:49:59 -07:00
|
|
|
|
|
|
|
spin_unlock(&intf->lock);
|
2007-09-25 18:57:13 -06:00
|
|
|
|
2008-02-10 14:50:04 -07:00
|
|
|
/*
|
|
|
|
* Call rt2x00_config_intf() outside of the spinlock context since
|
|
|
|
* the call will sleep for USB drivers. By using the ieee80211_if_conf
|
|
|
|
* values as arguments we make keep access to rt2x00_intf thread safe
|
|
|
|
* even without the lock.
|
|
|
|
*/
|
|
|
|
rt2x00lib_config_intf(rt2x00dev, intf, conf->type, NULL, conf->bssid);
|
|
|
|
|
2007-09-25 18:57:13 -06:00
|
|
|
/*
|
|
|
|
* We only need to initialize the beacon when master mode is enabled.
|
|
|
|
*/
|
|
|
|
if (conf->type != IEEE80211_IF_TYPE_AP || !conf->beacon)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
status = rt2x00dev->ops->hw->beacon_update(rt2x00dev->hw,
|
|
|
|
conf->beacon,
|
|
|
|
conf->beacon_control);
|
|
|
|
if (status)
|
|
|
|
dev_kfree_skb(conf->beacon);
|
|
|
|
|
|
|
|
return status;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(rt2x00mac_config_interface);
|
|
|
|
|
|
|
|
int rt2x00mac_get_stats(struct ieee80211_hw *hw,
|
|
|
|
struct ieee80211_low_level_stats *stats)
|
|
|
|
{
|
|
|
|
struct rt2x00_dev *rt2x00dev = hw->priv;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The dot11ACKFailureCount, dot11RTSFailureCount and
|
|
|
|
* dot11RTSSuccessCount are updated in interrupt time.
|
|
|
|
* dot11FCSErrorCount is updated in the link tuner.
|
|
|
|
*/
|
|
|
|
memcpy(stats, &rt2x00dev->low_level_stats, sizeof(*stats));
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(rt2x00mac_get_stats);
|
|
|
|
|
|
|
|
int rt2x00mac_get_tx_stats(struct ieee80211_hw *hw,
|
|
|
|
struct ieee80211_tx_queue_stats *stats)
|
|
|
|
{
|
|
|
|
struct rt2x00_dev *rt2x00dev = hw->priv;
|
|
|
|
unsigned int i;
|
|
|
|
|
2008-02-05 14:42:23 -07:00
|
|
|
for (i = 0; i < hw->queues; i++) {
|
|
|
|
stats->data[i].len = rt2x00dev->tx[i].length;
|
|
|
|
stats->data[i].limit = rt2x00dev->tx[i].limit;
|
|
|
|
stats->data[i].count = rt2x00dev->tx[i].count;
|
|
|
|
}
|
2007-09-25 18:57:13 -06:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(rt2x00mac_get_tx_stats);
|
|
|
|
|
2007-12-28 06:32:58 -07:00
|
|
|
void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw,
|
|
|
|
struct ieee80211_vif *vif,
|
|
|
|
struct ieee80211_bss_conf *bss_conf,
|
|
|
|
u32 changes)
|
2007-10-06 05:34:52 -06:00
|
|
|
{
|
|
|
|
struct rt2x00_dev *rt2x00dev = hw->priv;
|
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 07:49:59 -07:00
|
|
|
struct rt2x00_intf *intf = vif_to_intf(vif);
|
2007-10-06 05:34:52 -06: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 07:49:59 -07:00
|
|
|
* When the association status has changed we must reset the link
|
|
|
|
* tuner counter. This is because some drivers determine if they
|
|
|
|
* should perform link tuning based on the number of seconds
|
|
|
|
* while associated or not associated.
|
2007-10-06 05:34:52 -06: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 07:49:59 -07:00
|
|
|
if (changes & BSS_CHANGED_ASSOC) {
|
|
|
|
rt2x00dev->link.count = 0;
|
2007-10-06 05:34:52 -06: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 07:49:59 -07:00
|
|
|
if (bss_conf->assoc)
|
|
|
|
rt2x00dev->intf_associated++;
|
|
|
|
else
|
|
|
|
rt2x00dev->intf_associated--;
|
|
|
|
}
|
2007-10-06 05:34:52 -06: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 07:49:59 -07:00
|
|
|
/*
|
|
|
|
* When the preamble mode has changed, we should perform additional
|
|
|
|
* configuration steps. For all other changes we are already done.
|
|
|
|
*/
|
|
|
|
if (changes & BSS_CHANGED_ERP_PREAMBLE) {
|
|
|
|
rt2x00lib_config_preamble(rt2x00dev, intf,
|
|
|
|
bss_conf->use_short_preamble);
|
2007-10-06 05:34:52 -06: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 07:49:59 -07:00
|
|
|
spin_lock(&intf->lock);
|
|
|
|
memcpy(&intf->conf, bss_conf, sizeof(*bss_conf));
|
|
|
|
spin_unlock(&intf->lock);
|
|
|
|
}
|
2007-10-06 05:34:52 -06:00
|
|
|
}
|
2007-12-28 06:32:58 -07:00
|
|
|
EXPORT_SYMBOL_GPL(rt2x00mac_bss_info_changed);
|
2007-10-06 05:34:52 -06:00
|
|
|
|
2008-02-05 14:42:23 -07:00
|
|
|
int rt2x00mac_conf_tx(struct ieee80211_hw *hw, int queue_idx,
|
2007-09-25 18:57:13 -06:00
|
|
|
const struct ieee80211_tx_queue_params *params)
|
|
|
|
{
|
|
|
|
struct rt2x00_dev *rt2x00dev = hw->priv;
|
2008-02-05 14:42:23 -07:00
|
|
|
struct data_queue *queue;
|
2007-09-25 18:57:13 -06:00
|
|
|
|
2008-02-05 14:42:23 -07:00
|
|
|
queue = rt2x00queue_get_queue(rt2x00dev, queue_idx);
|
|
|
|
if (unlikely(!queue))
|
2007-09-25 18:57:13 -06:00
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The passed variables are stored as real value ((2^n)-1).
|
|
|
|
* Ralink registers require to know the bit number 'n'.
|
|
|
|
*/
|
2008-02-03 07:47:30 -07:00
|
|
|
if (params->cw_min > 0)
|
2008-02-05 14:42:23 -07:00
|
|
|
queue->cw_min = fls(params->cw_min);
|
2007-09-25 18:57:13 -06:00
|
|
|
else
|
2008-02-05 14:42:23 -07:00
|
|
|
queue->cw_min = 5; /* cw_min: 2^5 = 32. */
|
2007-09-25 18:57:13 -06:00
|
|
|
|
2008-02-03 07:47:30 -07:00
|
|
|
if (params->cw_max > 0)
|
2008-02-05 14:42:23 -07:00
|
|
|
queue->cw_max = fls(params->cw_max);
|
2007-09-25 18:57:13 -06:00
|
|
|
else
|
2008-02-05 14:42:23 -07:00
|
|
|
queue->cw_max = 10; /* cw_min: 2^10 = 1024. */
|
2007-09-25 18:57:13 -06:00
|
|
|
|
2008-02-03 07:47:30 -07:00
|
|
|
if (params->aifs >= 0)
|
2008-02-05 14:42:23 -07:00
|
|
|
queue->aifs = params->aifs;
|
2007-09-25 18:57:13 -06:00
|
|
|
else
|
2008-02-05 14:42:23 -07:00
|
|
|
queue->aifs = 2;
|
2007-09-25 18:57:13 -06:00
|
|
|
|
|
|
|
INFO(rt2x00dev,
|
2008-02-05 14:42:23 -07:00
|
|
|
"Configured TX queue %d - CWmin: %d, CWmax: %d, Aifs: %d.\n",
|
|
|
|
queue_idx, queue->cw_min, queue->cw_max, queue->aifs);
|
2007-09-25 18:57:13 -06:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(rt2x00mac_conf_tx);
|