Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

2026-11-10 20:48:12 +00:00 · 2009-11-24 15:01:29 -08:00 · 2009-11-24 15:01:29 -08:00 · 4ba3eb034f
commit 4ba3eb034f
parent 35700212b4 18b6c9a221
125 changed files with 3163 additions and 1936 deletions
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
--- a/net/mac80211/Makefile
+++ b/net/mac80211/Makefile
--- a/net/mac80211/agg-rx.c
+++ b/net/mac80211/agg-rx.c
--- a/net/mac80211/agg-tx.c
+++ b/net/mac80211/agg-tx.c
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
--- a/net/mac80211/debugfs.c
+++ b/net/mac80211/debugfs.c
--- a/net/mac80211/debugfs_sta.c
+++ b/net/mac80211/debugfs_sta.c
--- a/net/mac80211/driver-ops.h
+++ b/net/mac80211/driver-ops.h
--- a/net/mac80211/driver-trace.h
+++ b/net/mac80211/driver-trace.h
--- a/net/mac80211/ht.c
+++ b/net/mac80211/ht.c
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
--- a/net/mac80211/mesh.c
+++ b/net/mac80211/mesh.c
--- a/net/mac80211/mesh.h
+++ b/net/mac80211/mesh.h
--- a/net/mac80211/mesh_hwmp.c
+++ b/net/mac80211/mesh_hwmp.c
--- a/net/mac80211/mesh_pathtbl.c
+++ b/net/mac80211/mesh_pathtbl.c
--- a/net/mac80211/mesh_plink.c
+++ b/net/mac80211/mesh_plink.c
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
--- a/net/mac80211/rate.c
+++ b/net/mac80211/rate.c
--- a/net/mac80211/rate.h
+++ b/net/mac80211/rate.h
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
--- a/net/mac80211/spectmgmt.c
+++ b/net/mac80211/spectmgmt.c
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
--- a/net/mac80211/status.c
+++ b/net/mac80211/status.c
--- a/net/mac80211/tkip.c
+++ b/net/mac80211/tkip.c
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
--- a/net/mac80211/wep.c
+++ b/net/mac80211/wep.c
--- a/net/mac80211/wpa.c
+++ b/net/mac80211/wpa.c
--- a/net/rfkill/core.c
+++ b/net/rfkill/core.c
--- a/net/wireless/Kconfig
+++ b/net/wireless/Kconfig
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
--- a/net/wireless/ibss.c
+++ b/net/wireless/ibss.c
--- a/net/wireless/mlme.c
+++ b/net/wireless/mlme.c
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
--- a/net/wireless/wext-compat.c
+++ b/net/wireless/wext-compat.c