* Please pull 'upstream' branch of rt2x00
@ 2008-10-29 16:16 Ivo van Doorn
2008-10-29 16:17 ` [PATCH 1/5] rt2x00: Optimize configuration handling Ivo van Doorn
0 siblings, 1 reply; 6+ messages in thread
From: Ivo van Doorn @ 2008-10-29 16:16 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-wireless, rt2400-devel
Hi John,
Well over a month since my last rt2x00 patches, but finally a real rt2x00 update.
The first 2 patches are updates based on recent mac80211 changes,
especially the configuration patch is important.
I also noticed that the recent Kconfig fixes introduced a possibility of a build error,
not sure if it was reported by somebody yet, but in any case it was possible to
build mac80211 as module and rt2x00 compiled into the kernel, causing obvious
problems.
Ivo
---
The following changes since commit 43288a0fdd6b970dec3017ceaffb70cf6347e5f0:
John W. Linville (1):
ath5k: fixup warnings created by "ath5k: Reset key cache..."
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git/ upstream
Ivo van Doorn (5):
rt2x00: Optimize configuration handling
rt2x00: Remove ieee80211_bss_conf from rt2x00_intf
rt2x00: Improve interface_modes initialization
rt2x00: Fix build error when mac80211=M rt2x00=Y
rt2x00: Release rt2x00 2.2.2
drivers/net/wireless/rt2x00/Kconfig | 2 +-
drivers/net/wireless/rt2x00/rt2400pci.c | 167 ++++++++++-----------
drivers/net/wireless/rt2x00/rt2500pci.c | 206 ++++++++++++-------------
drivers/net/wireless/rt2x00/rt2500usb.c | 110 ++++++-------
drivers/net/wireless/rt2x00/rt2x00.h | 44 ++----
drivers/net/wireless/rt2x00/rt2x00config.c | 164 +++-----------------
drivers/net/wireless/rt2x00/rt2x00dev.c | 16 ++-
drivers/net/wireless/rt2x00/rt2x00lib.h | 3 +-
drivers/net/wireless/rt2x00/rt2x00mac.c | 12 +--
drivers/net/wireless/rt2x00/rt61pci.c | 231 ++++++++++++++--------------
drivers/net/wireless/rt2x00/rt73usb.c | 216 +++++++++++++-------------
11 files changed, 501 insertions(+), 670 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/5] rt2x00: Optimize configuration handling
2008-10-29 16:16 Please pull 'upstream' branch of rt2x00 Ivo van Doorn
@ 2008-10-29 16:17 ` Ivo van Doorn
2008-10-29 16:18 ` [PATCH 2/5] rt2x00: Remove ieee80211_bss_conf from rt2x00_intf Ivo van Doorn
0 siblings, 1 reply; 6+ messages in thread
From: Ivo van Doorn @ 2008-10-29 16:17 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-wireless, rt2400-devel
Implement latest changed from mac80211 configuration
handling to optmize configuration handling in rt2x00.
* Remove set_retry_limit callback function, handled
through config()
* Move config_antenna to its own callback function,
it isn't handled by mac80211 anymore
* Use IEEE80211_CONF_CHANGED_* flags and remove manual
checks
* Removed deprecated short slot setting through config()
and put it in config_erp() through which mac80211 now
configures it
* Remove config_phymode() and move contents to config_erp()
since it only managed the basic rates which is now
determined by mac80211 through config_erp().
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
---
Patch has a size of 52Kb, it can be found here:
http://www.kernel.org/pub/linux/kernel/people/ivd/patches/0001-rt2x00-Optimize-configuration-handling.patch
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/5] rt2x00: Remove ieee80211_bss_conf from rt2x00_intf
2008-10-29 16:17 ` [PATCH 1/5] rt2x00: Optimize configuration handling Ivo van Doorn
@ 2008-10-29 16:18 ` Ivo van Doorn
2008-10-29 16:18 ` [PATCH 3/5] rt2x00: Improve interface_modes initialization Ivo van Doorn
0 siblings, 1 reply; 6+ messages in thread
From: Ivo van Doorn @ 2008-10-29 16:18 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-wireless, rt2400-devel
We can safely remove ieee80211_bss_conf from rt2x00_intf,
it is provided by mac80211 in ieee80211_vif as well.
(rt2x00_intf is the drv_priv field of ieee80211_vif).
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
---
drivers/net/wireless/rt2x00/rt2x00.h | 7 -------
drivers/net/wireless/rt2x00/rt2x00dev.c | 2 +-
drivers/net/wireless/rt2x00/rt2x00mac.c | 1 -
3 files changed, 1 insertions(+), 9 deletions(-)
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 4d983e6..ca1f9fe 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -348,13 +348,6 @@ struct rt2x00_intf {
spinlock_t lock;
/*
- * BSS configuration. Copied from the structure
- * passed to us through the bss_info_changed()
- * callback funtion.
- */
- struct ieee80211_bss_conf conf;
-
- /*
* MAC of the device.
*/
u8 mac[ETH_ALEN];
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index e1feab8..c42e4fd 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -417,7 +417,7 @@ static void rt2x00lib_intf_scheduled_iter(void *data, u8 *mac,
*/
spin_lock(&intf->lock);
- memcpy(&conf, &intf->conf, sizeof(conf));
+ memcpy(&conf, &vif->bss_conf, sizeof(conf));
delayed_flags = intf->delayed_flags;
intf->delayed_flags = 0;
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index 3a3b5ad..8fc2315 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -634,7 +634,6 @@ void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw,
}
spin_lock(&intf->lock);
- memcpy(&intf->conf, bss_conf, sizeof(*bss_conf));
if (delayed) {
intf->delayed_flags |= delayed;
schedule_work(&rt2x00dev->intf_work);
--
1.5.6.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/5] rt2x00: Improve interface_modes initialization
2008-10-29 16:18 ` [PATCH 2/5] rt2x00: Remove ieee80211_bss_conf from rt2x00_intf Ivo van Doorn
@ 2008-10-29 16:18 ` Ivo van Doorn
2008-10-29 16:19 ` [PATCH 4/5] rt2x00: Fix build error when mac80211=M rt2x00=Y Ivo van Doorn
0 siblings, 1 reply; 6+ messages in thread
From: Ivo van Doorn @ 2008-10-29 16:18 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-wireless, rt2400-devel
All operating modes which require beaconing should
depend on the availability of beacon entries from
the hardware.
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
---
drivers/net/wireless/rt2x00/rt2x00dev.c | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index c42e4fd..477a944 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -1056,10 +1056,16 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev)
*/
rt2x00dev->hw->vif_data_size = sizeof(struct rt2x00_intf);
- rt2x00dev->hw->wiphy->interface_modes =
- BIT(NL80211_IFTYPE_AP) |
- BIT(NL80211_IFTYPE_STATION) |
- BIT(NL80211_IFTYPE_ADHOC);
+ /*
+ * Determine which operating modes are supported, all modes
+ * which require beaconing, depend on the availability of
+ * beacon entries.
+ */
+ rt2x00dev->hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION);
+ if (rt2x00dev->ops->bcn->entry_num > 0)
+ rt2x00dev->hw->wiphy->interface_modes |=
+ BIT(NL80211_IFTYPE_ADHOC) |
+ BIT(NL80211_IFTYPE_AP);
/*
* Let the driver probe the device to detect the capabilities.
--
1.5.6.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2008-10-29 16:29 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-10-29 16:16 Please pull 'upstream' branch of rt2x00 Ivo van Doorn
2008-10-29 16:17 ` [PATCH 1/5] rt2x00: Optimize configuration handling Ivo van Doorn
2008-10-29 16:18 ` [PATCH 2/5] rt2x00: Remove ieee80211_bss_conf from rt2x00_intf Ivo van Doorn
2008-10-29 16:18 ` [PATCH 3/5] rt2x00: Improve interface_modes initialization Ivo van Doorn
2008-10-29 16:19 ` [PATCH 4/5] rt2x00: Fix build error when mac80211=M rt2x00=Y Ivo van Doorn
2008-10-29 16:19 ` [PATCH 5/5] rt2x00: Release rt2x00 2.2.2 Ivo van Doorn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).