aboutsummaryrefslogtreecommitdiffstats
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2008-10-29 10:09:07 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2008-10-29 10:09:07 -0700
commit9333e6668dfb3480c413b4aba643035919db3a32 (patch)
tree848cc63ada696bb4df717a2b6aa4182343c6944d
parent29df2ab2eee0366eff377c8a8d1806fda902de31 (diff)
downloadpatches-9333e6668dfb3480c413b4aba643035919db3a32.tar.gz
rename rtl2860 driver to rt2860 as that's the correct name
-rw-r--r--series2
-rw-r--r--staging/staging-add-rt2860-wireless-driver.patch (renamed from staging/staging-add-rtl2860-wireless-driver.patch)281
2 files changed, 141 insertions, 142 deletions
diff --git a/series b/series
index d0d0846a553a3d..5a78e2fc6fb377 100644
--- a/series
+++ b/series
@@ -104,7 +104,7 @@ staging/staging-at76_usb-remove-compiler-warnings.patch
staging/staging-at76_usb-fix-up-all-remaining-checkpatch.pl-warnings.patch
staging/staging-add-agnx-wireless-driver.patch
staging/staging-add-otus-atheros-wireless-network-driver.patch
-staging/staging-add-rtl2860-wireless-driver.patch
+staging/staging-add-rt2860-wireless-driver.patch
# can not even compile :(
#staging/usb-add-princeton-instruments-usb-camera-driver.patch
diff --git a/staging/staging-add-rtl2860-wireless-driver.patch b/staging/staging-add-rt2860-wireless-driver.patch
index 7756fee3da28ac..4e41f8f08924e7 100644
--- a/staging/staging-add-rtl2860-wireless-driver.patch
+++ b/staging/staging-add-rt2860-wireless-driver.patch
@@ -1,15 +1,15 @@
From 52076881ca20d02dd8b4b14348a08a3479715252 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Tue, 28 Oct 2008 14:48:09 -0700
-Subject: Staging: add rtl2860 wireless driver
+Subject: Staging: add rt2860 wireless driver
From: Greg Kroah-Hartman <gregkh@suse.de>
-This is the Ralink RTL2860 driver from the company that does
-horrible things like reading a config file from /etc. However, the
-driver that is currently under development from the wireless development
-community is not working at all yet, so distros and users are using this
-version instead (quite common hardware on a lot of netbook machines).
+This is the Ralink RT2860 driver from the company that does horrible
+things like reading a config file from /etc. However, the driver that
+is currently under development from the wireless development community
+is not working at all yet, so distros and users are using this version
+instead (quite common hardware on a lot of netbook machines).
So here is this driver, for now, until the wireless developers get a
"clean" version into the main tree, or until this version is cleaned up
@@ -19,74 +19,73 @@ Ported to the Linux build system and cleaned up a bit already by me.
Cc: Linux wireless <linux-wireless@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
----
---
- drivers/staging/Kconfig | 2
- drivers/staging/Makefile | 1
- drivers/staging/rtl2860/2860_main_dev.c | 1377 +++
- drivers/staging/rtl2860/Kconfig | 5
- drivers/staging/rtl2860/Makefile | 41
- drivers/staging/rtl2860/TODO | 17
- drivers/staging/rtl2860/aironet.h | 210
- drivers/staging/rtl2860/ap.h | 557 +
- drivers/staging/rtl2860/chlist.h | 1296 +++
- drivers/staging/rtl2860/common/2860_rtmp_init.c | 922 ++
- drivers/staging/rtl2860/common/action.c | 1031 ++
- drivers/staging/rtl2860/common/action.h | 68
- drivers/staging/rtl2860/common/ba_action.c | 1802 ++++
- drivers/staging/rtl2860/common/cmm_data.c | 3469 +++++++++
- drivers/staging/rtl2860/common/cmm_data_2860.c | 1240 +++
- drivers/staging/rtl2860/common/cmm_info.c | 3417 +++++++++
- drivers/staging/rtl2860/common/cmm_sanity.c | 1633 ++++
- drivers/staging/rtl2860/common/cmm_sync.c | 702 +
- drivers/staging/rtl2860/common/cmm_wpa.c | 1606 ++++
- drivers/staging/rtl2860/common/dfs.c | 453 +
- drivers/staging/rtl2860/common/eeprom.c | 244
- drivers/staging/rtl2860/common/firmware.h | 558 +
- drivers/staging/rtl2860/common/md5.c | 1427 +++
- drivers/staging/rtl2860/common/mlme.c | 8667 ++++++++++++++++++++++++
- drivers/staging/rtl2860/common/netif_block.c | 144
- drivers/staging/rtl2860/common/netif_block.h | 58
- drivers/staging/rtl2860/common/rtmp_init.c | 3757 ++++++++++
- drivers/staging/rtl2860/common/rtmp_tkip.c | 1607 ++++
- drivers/staging/rtl2860/common/rtmp_wep.c | 499 +
- drivers/staging/rtl2860/common/spectrum.c | 1877 +++++
- drivers/staging/rtl2860/config.mk | 245
- drivers/staging/rtl2860/dfs.h | 100
- drivers/staging/rtl2860/leap.h | 215
- drivers/staging/rtl2860/link_list.h | 134
- drivers/staging/rtl2860/md4.h | 42
- drivers/staging/rtl2860/md5.h | 107
- drivers/staging/rtl2860/mlme.h | 1447 ++++
- drivers/staging/rtl2860/oid.h | 995 ++
- drivers/staging/rtl2860/rt2860.h | 349
- drivers/staging/rtl2860/rt28xx.h | 2714 +++++++
- drivers/staging/rtl2860/rt_ate.c | 6025 ++++++++++++++++
- drivers/staging/rtl2860/rt_ate.h | 353
- drivers/staging/rtl2860/rt_config.h | 101
- drivers/staging/rtl2860/rt_linux.c | 1054 ++
- drivers/staging/rtl2860/rt_linux.h | 926 ++
- drivers/staging/rtl2860/rt_main_dev.c | 1686 ++++
- drivers/staging/rtl2860/rt_profile.c | 1976 +++++
- drivers/staging/rtl2860/rtmp.h | 7177 +++++++++++++++++++
- drivers/staging/rtl2860/rtmp_ckipmic.h | 113
- drivers/staging/rtl2860/rtmp_def.h | 1588 ++++
- drivers/staging/rtl2860/rtmp_type.h | 94
- drivers/staging/rtl2860/spectrum.h | 322
- drivers/staging/rtl2860/spectrum_def.h | 95
- drivers/staging/rtl2860/sta/aironet.c | 1312 +++
- drivers/staging/rtl2860/sta/assoc.c | 1826 +++++
- drivers/staging/rtl2860/sta/auth.c | 474 +
- drivers/staging/rtl2860/sta/auth_rsp.c | 167
- drivers/staging/rtl2860/sta/connect.c | 2751 +++++++
- drivers/staging/rtl2860/sta/dls.c | 2201 ++++++
- drivers/staging/rtl2860/sta/rtmp_data.c | 2614 +++++++
- drivers/staging/rtl2860/sta/sanity.c | 420 +
- drivers/staging/rtl2860/sta/sync.c | 1961 +++++
- drivers/staging/rtl2860/sta/wpa.c | 2086 +++++
- drivers/staging/rtl2860/sta_ioctl.c | 6944 +++++++++++++++++++
- drivers/staging/rtl2860/wpa.h | 356
+ drivers/staging/Kconfig | 2
+ drivers/staging/Makefile | 1
+ drivers/staging/rt2860/2860_main_dev.c | 1377 +++
+ drivers/staging/rt2860/Kconfig | 5
+ drivers/staging/rt2860/Makefile | 41
+ drivers/staging/rt2860/TODO | 17
+ drivers/staging/rt2860/aironet.h | 210
+ drivers/staging/rt2860/ap.h | 557 +
+ drivers/staging/rt2860/chlist.h | 1296 +++
+ drivers/staging/rt2860/common/2860_rtmp_init.c | 922 ++
+ drivers/staging/rt2860/common/action.c | 1031 ++
+ drivers/staging/rt2860/common/action.h | 68
+ drivers/staging/rt2860/common/ba_action.c | 1802 +++++
+ drivers/staging/rt2860/common/cmm_data.c | 3469 ++++++++++
+ drivers/staging/rt2860/common/cmm_data_2860.c | 1240 +++
+ drivers/staging/rt2860/common/cmm_info.c | 3417 +++++++++
+ drivers/staging/rt2860/common/cmm_sanity.c | 1633 ++++
+ drivers/staging/rt2860/common/cmm_sync.c | 702 ++
+ drivers/staging/rt2860/common/cmm_wpa.c | 1606 ++++
+ drivers/staging/rt2860/common/dfs.c | 453 +
+ drivers/staging/rt2860/common/eeprom.c | 244
+ drivers/staging/rt2860/common/firmware.h | 558 +
+ drivers/staging/rt2860/common/md5.c | 1427 ++++
+ drivers/staging/rt2860/common/mlme.c | 8667 +++++++++++++++++++++++++
+ drivers/staging/rt2860/common/netif_block.c | 144
+ drivers/staging/rt2860/common/netif_block.h | 58
+ drivers/staging/rt2860/common/rtmp_init.c | 3757 ++++++++++
+ drivers/staging/rt2860/common/rtmp_tkip.c | 1607 ++++
+ drivers/staging/rt2860/common/rtmp_wep.c | 499 +
+ drivers/staging/rt2860/common/spectrum.c | 1877 +++++
+ drivers/staging/rt2860/config.mk | 245
+ drivers/staging/rt2860/dfs.h | 100
+ drivers/staging/rt2860/leap.h | 215
+ drivers/staging/rt2860/link_list.h | 134
+ drivers/staging/rt2860/md4.h | 42
+ drivers/staging/rt2860/md5.h | 107
+ drivers/staging/rt2860/mlme.h | 1447 ++++
+ drivers/staging/rt2860/oid.h | 995 ++
+ drivers/staging/rt2860/rt2860.h | 349 +
+ drivers/staging/rt2860/rt28xx.h | 2714 +++++++
+ drivers/staging/rt2860/rt_ate.c | 6025 +++++++++++++++++
+ drivers/staging/rt2860/rt_ate.h | 353 +
+ drivers/staging/rt2860/rt_config.h | 101
+ drivers/staging/rt2860/rt_linux.c | 1054 +++
+ drivers/staging/rt2860/rt_linux.h | 926 ++
+ drivers/staging/rt2860/rt_main_dev.c | 1686 ++++
+ drivers/staging/rt2860/rt_profile.c | 1976 +++++
+ drivers/staging/rt2860/rtmp.h | 7177 ++++++++++++++++++++
+ drivers/staging/rt2860/rtmp_ckipmic.h | 113
+ drivers/staging/rt2860/rtmp_def.h | 1588 ++++
+ drivers/staging/rt2860/rtmp_type.h | 94
+ drivers/staging/rt2860/spectrum.h | 322
+ drivers/staging/rt2860/spectrum_def.h | 95
+ drivers/staging/rt2860/sta/aironet.c | 1312 +++
+ drivers/staging/rt2860/sta/assoc.c | 1826 +++++
+ drivers/staging/rt2860/sta/auth.c | 474 +
+ drivers/staging/rt2860/sta/auth_rsp.c | 167
+ drivers/staging/rt2860/sta/connect.c | 2751 +++++++
+ drivers/staging/rt2860/sta/dls.c | 2201 ++++++
+ drivers/staging/rt2860/sta/rtmp_data.c | 2614 +++++++
+ drivers/staging/rt2860/sta/sanity.c | 420 +
+ drivers/staging/rt2860/sta/sync.c | 1961 +++++
+ drivers/staging/rt2860/sta/wpa.c | 2086 ++++++
+ drivers/staging/rt2860/sta_ioctl.c | 6944 ++++++++++++++++++++
+ drivers/staging/rt2860/wpa.h | 356 +
65 files changed, 89657 insertions(+)
--- a/drivers/staging/Kconfig
@@ -95,7 +94,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
source "drivers/staging/otus/Kconfig"
-+source "drivers/staging/rtl2860/Kconfig"
++source "drivers/staging/rt2860/Kconfig"
+
endif # STAGING
--- a/drivers/staging/Makefile
@@ -104,9 +103,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
obj-$(CONFIG_POCH) += poch/
obj-$(CONFIG_AGNX) += agnx/
obj-$(CONFIG_OTUS) += otus/
-+obj-$(CONFIG_RTL2860) += rtl2860/
++obj-$(CONFIG_RT2860) += rt2860/
--- /dev/null
-+++ b/drivers/staging/rtl2860/2860_main_dev.c
++++ b/drivers/staging/rt2860/2860_main_dev.c
@@ -0,0 +1,1377 @@
+/*
+ *************************************************************************
@@ -1486,7 +1485,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+}
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/aironet.h
++++ b/drivers/staging/rt2860/aironet.h
@@ -0,0 +1,210 @@
+/*
+ *************************************************************************
@@ -1699,7 +1698,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+#endif // __AIRONET_H__
--- /dev/null
-+++ b/drivers/staging/rtl2860/ap.h
++++ b/drivers/staging/rt2860/ap.h
@@ -0,0 +1,557 @@
+/*
+ *************************************************************************
@@ -2259,7 +2258,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+#endif // __AP_H__
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/chlist.h
++++ b/drivers/staging/rt2860/chlist.h
@@ -0,0 +1,1296 @@
+/*
+ *************************************************************************
@@ -3558,7 +3557,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+#endif // __CHLIST_H__
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/common/2860_rtmp_init.c
++++ b/drivers/staging/rt2860/common/2860_rtmp_init.c
@@ -0,0 +1,922 @@
+/*
+ *************************************************************************
@@ -4483,7 +4482,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+/* End of 2860_rtmp_init.c */
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/common/action.c
++++ b/drivers/staging/rt2860/common/action.c
@@ -0,0 +1,1031 @@
+/*
+ *************************************************************************
@@ -5517,7 +5516,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+ return;
+}
--- /dev/null
-+++ b/drivers/staging/rtl2860/common/action.h
++++ b/drivers/staging/rt2860/common/action.h
@@ -0,0 +1,68 @@
+/*
+ *************************************************************************
@@ -5588,7 +5587,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/common/ba_action.c
++++ b/drivers/staging/rt2860/common/ba_action.c
@@ -0,0 +1,1802 @@
+/*
+ *************************************************************************
@@ -7393,7 +7392,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+#endif // DOT11_N_SUPPORT //
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/common/cmm_data_2860.c
++++ b/drivers/staging/rt2860/common/cmm_data_2860.c
@@ -0,0 +1,1240 @@
+/*
+ *************************************************************************
@@ -8636,7 +8635,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+ }while (i++ < 100);
+}
--- /dev/null
-+++ b/drivers/staging/rtl2860/common/cmm_data.c
++++ b/drivers/staging/rt2860/common/cmm_data.c
@@ -0,0 +1,3469 @@
+/*
+ *************************************************************************
@@ -12108,7 +12107,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+}
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/common/cmm_info.c
++++ b/drivers/staging/rt2860/common/cmm_info.c
@@ -0,0 +1,3417 @@
+/*
+ *************************************************************************
@@ -15528,7 +15527,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+}
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/common/cmm_sanity.c
++++ b/drivers/staging/rt2860/common/cmm_sanity.c
@@ -0,0 +1,1633 @@
+/*
+ *************************************************************************
@@ -17164,7 +17163,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+#endif // QOS_DLS_SUPPORT //
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/common/cmm_sync.c
++++ b/drivers/staging/rt2860/common/cmm_sync.c
@@ -0,0 +1,702 @@
+/*
+ *************************************************************************
@@ -17869,7 +17868,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/common/cmm_wpa.c
++++ b/drivers/staging/rt2860/common/cmm_wpa.c
@@ -0,0 +1,1606 @@
+/*
+ *************************************************************************
@@ -19478,7 +19477,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+}
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/common/dfs.c
++++ b/drivers/staging/rt2860/common/dfs.c
@@ -0,0 +1,453 @@
+/*
+ *************************************************************************
@@ -19934,7 +19933,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/common/eeprom.c
++++ b/drivers/staging/rt2860/common/eeprom.c
@@ -0,0 +1,244 @@
+/*
+ *************************************************************************
@@ -20181,7 +20180,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+}
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/common/firmware.h
++++ b/drivers/staging/rt2860/common/firmware.h
@@ -0,0 +1,558 @@
+/*
+ Copyright (c) 2007, Ralink Technology Corporation
@@ -20742,7 +20741,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b, 0x94, 0xeb, } ;
--- /dev/null
-+++ b/drivers/staging/rtl2860/common/md5.c
++++ b/drivers/staging/rt2860/common/md5.c
@@ -0,0 +1,1427 @@
+/*
+ *************************************************************************
@@ -22172,7 +22171,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/common/mlme.c
++++ b/drivers/staging/rt2860/common/mlme.c
@@ -0,0 +1,8667 @@
+/*
+ *************************************************************************
@@ -30842,7 +30841,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+}
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/common/netif_block.c
++++ b/drivers/staging/rt2860/common/netif_block.c
@@ -0,0 +1,144 @@
+/*
+ *************************************************************************
@@ -30989,7 +30988,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+}
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/common/netif_block.h
++++ b/drivers/staging/rt2860/common/netif_block.h
@@ -0,0 +1,58 @@
+/*
+ *************************************************************************
@@ -31050,7 +31049,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+#endif // __NET_IF_BLOCK_H__
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/common/rtmp_init.c
++++ b/drivers/staging/rt2860/common/rtmp_init.c
@@ -0,0 +1,3757 @@
+/*
+ *************************************************************************
@@ -34810,7 +34809,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/common/rtmp_tkip.c
++++ b/drivers/staging/rt2860/common/rtmp_tkip.c
@@ -0,0 +1,1607 @@
+/*
+ *************************************************************************
@@ -36420,7 +36419,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+}
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/common/rtmp_wep.c
++++ b/drivers/staging/rt2860/common/rtmp_wep.c
@@ -0,0 +1,499 @@
+/*
+ *************************************************************************
@@ -36922,7 +36921,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+}
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/common/spectrum.c
++++ b/drivers/staging/rt2860/common/spectrum.c
@@ -0,0 +1,1877 @@
+/*
+ *************************************************************************
@@ -38802,7 +38801,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+}
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/config.mk
++++ b/drivers/staging/rt2860/config.mk
@@ -0,0 +1,245 @@
+# Support ATE function
+HAS_ATE=n
@@ -39050,7 +39049,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+endif
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/dfs.h
++++ b/drivers/staging/rt2860/dfs.h
@@ -0,0 +1,100 @@
+/*
+ *************************************************************************
@@ -39153,15 +39152,15 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/Kconfig
++++ b/drivers/staging/rt2860/Kconfig
@@ -0,0 +1,5 @@
-+config RTL2860
++config RT2860
+ tristate "Ralink 2860 wireless support"
+ depends on PCI && X86 && WLAN_80211
+ ---help---
+ This is an experimental driver for the Ralink 2860 wireless chip.
--- /dev/null
-+++ b/drivers/staging/rtl2860/leap.h
++++ b/drivers/staging/rt2860/leap.h
@@ -0,0 +1,215 @@
+/*
+ *************************************************************************
@@ -39379,7 +39378,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+#endif // __LEAP_H__
--- /dev/null
-+++ b/drivers/staging/rtl2860/link_list.h
++++ b/drivers/staging/rt2860/link_list.h
@@ -0,0 +1,134 @@
+/*
+ *************************************************************************
@@ -39516,9 +39515,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+#endif // ___LINK_LIST_H__ //
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/Makefile
++++ b/drivers/staging/rt2860/Makefile
@@ -0,0 +1,41 @@
-+obj-$(CONFIG_RTL2860) += rt2860sta.o
++obj-$(CONFIG_RT2860) += rt2860sta.o
+
+# TODO: all of these should be removed
+EXTRA_CFLAGS += -DLINUX -DAGGREGATION_SUPPORT -DPIGGYBACK_SUPPORT -DWMM_SUPPORT
@@ -39560,7 +39559,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+ 2860_main_dev.o \
+ common/cmm_data_2860.o
--- /dev/null
-+++ b/drivers/staging/rtl2860/md4.h
++++ b/drivers/staging/rt2860/md4.h
@@ -0,0 +1,42 @@
+/*
+ *************************************************************************
@@ -39606,7 +39605,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+#endif //__MD4_H__
\ No newline at end of file
--- /dev/null
-+++ b/drivers/staging/rtl2860/md5.h
++++ b/drivers/staging/rt2860/md5.h
@@ -0,0 +1,107 @@
+/*
+ *************************************************************************
@@ -39716,7 +39715,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+#endif /* aes.h */
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/mlme.h
++++ b/drivers/staging/rt2860/mlme.h
@@ -0,0 +1,1447 @@
+/*
+ *************************************************************************
@@ -41166,7 +41165,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+#endif // MLME_H__
--- /dev/null
-+++ b/drivers/staging/rtl2860/oid.h
++++ b/drivers/staging/rt2860/oid.h
@@ -0,0 +1,995 @@
+/*
+ *************************************************************************
@@ -42164,7 +42163,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+#endif // _OID_H_
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/rt2860.h
++++ b/drivers/staging/rt2860/rt2860.h
@@ -0,0 +1,349 @@
+/*
+ *************************************************************************
@@ -42516,7 +42515,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+#endif //__RT2860_H__
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/rt28xx.h
++++ b/drivers/staging/rt2860/rt28xx.h
@@ -0,0 +1,2714 @@
+/*
+ *************************************************************************
@@ -45233,7 +45232,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+#endif // __RT28XX_H__
--- /dev/null
-+++ b/drivers/staging/rtl2860/rt_ate.c
++++ b/drivers/staging/rt2860/rt_ate.c
@@ -0,0 +1,6025 @@
+/*
+ *************************************************************************
@@ -51261,7 +51260,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+#endif // RALINK_ATE //
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/rt_ate.h
++++ b/drivers/staging/rt2860/rt_ate.h
@@ -0,0 +1,353 @@
+/*
+ *************************************************************************
@@ -51617,7 +51616,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+#endif // CONFIG_STA_SUPPORT //
+#endif // __ATE_H__ //
--- /dev/null
-+++ b/drivers/staging/rtl2860/rt_config.h
++++ b/drivers/staging/rt2860/rt_config.h
@@ -0,0 +1,101 @@
+/*
+ *************************************************************************
@@ -51721,7 +51720,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+#endif // __RT_CONFIG_H__
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/rt_linux.c
++++ b/drivers/staging/rt2860/rt_linux.c
@@ -0,0 +1,1054 @@
+/*
+ *************************************************************************
@@ -52778,7 +52777,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+}
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/rt_linux.h
++++ b/drivers/staging/rt2860/rt_linux.h
@@ -0,0 +1,926 @@
+/*
+ *************************************************************************
@@ -53707,7 +53706,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/rt_main_dev.c
++++ b/drivers/staging/rt2860/rt_main_dev.c
@@ -0,0 +1,1686 @@
+/*
+ *************************************************************************
@@ -55396,7 +55395,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+}
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/rtmp_ckipmic.h
++++ b/drivers/staging/rt2860/rtmp_ckipmic.h
@@ -0,0 +1,113 @@
+/*
+ *************************************************************************
@@ -55512,7 +55511,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+#endif //__RTMP_CKIPMIC_H__
--- /dev/null
-+++ b/drivers/staging/rtl2860/rtmp_def.h
++++ b/drivers/staging/rt2860/rtmp_def.h
@@ -0,0 +1,1588 @@
+/*
+ *************************************************************************
@@ -57103,7 +57102,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/rtmp.h
++++ b/drivers/staging/rt2860/rtmp.h
@@ -0,0 +1,7177 @@
+/*
+ *************************************************************************
@@ -64283,7 +64282,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+#endif // __RTMP_H__
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/rtmp_type.h
++++ b/drivers/staging/rt2860/rtmp_type.h
@@ -0,0 +1,94 @@
+/*
+ *************************************************************************
@@ -64380,7 +64379,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+#endif // __RTMP_TYPE_H__
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/rt_profile.c
++++ b/drivers/staging/rt2860/rt_profile.c
@@ -0,0 +1,1976 @@
+/*
+ *************************************************************************
@@ -66359,7 +66358,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+#endif // DOT11_N_SUPPORT //
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/spectrum_def.h
++++ b/drivers/staging/rt2860/spectrum_def.h
@@ -0,0 +1,95 @@
+/*
+ *************************************************************************
@@ -66457,7 +66456,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+#endif // __SPECTRUM_DEF_H__ //
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/spectrum.h
++++ b/drivers/staging/rt2860/spectrum.h
@@ -0,0 +1,322 @@
+/*
+ *************************************************************************
@@ -66782,7 +66781,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+#endif // __SPECTRUM_H__ //
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/sta/aironet.c
++++ b/drivers/staging/rt2860/sta/aironet.c
@@ -0,0 +1,1312 @@
+/*
+ *************************************************************************
@@ -68097,7 +68096,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+ }
+}
--- /dev/null
-+++ b/drivers/staging/rtl2860/sta/assoc.c
++++ b/drivers/staging/rt2860/sta/assoc.c
@@ -0,0 +1,1826 @@
+/*
+ *************************************************************************
@@ -69926,7 +69925,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+#endif // NATIVE_WPA_SUPPLICANT_SUPPORT //
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/sta/auth.c
++++ b/drivers/staging/rt2860/sta/auth.c
@@ -0,0 +1,474 @@
+/*
+ *************************************************************************
@@ -70403,7 +70402,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/sta/auth_rsp.c
++++ b/drivers/staging/rt2860/sta/auth_rsp.c
@@ -0,0 +1,167 @@
+/*
+ *************************************************************************
@@ -70573,7 +70572,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+}
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/sta/connect.c
++++ b/drivers/staging/rt2860/sta/connect.c
@@ -0,0 +1,2751 @@
+/*
+ *************************************************************************
@@ -73327,7 +73326,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/sta/dls.c
++++ b/drivers/staging/rt2860/sta/dls.c
@@ -0,0 +1,2201 @@
+/*
+ *************************************************************************
@@ -75531,7 +75530,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+}
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/sta_ioctl.c
++++ b/drivers/staging/rt2860/sta_ioctl.c
@@ -0,0 +1,6944 @@
+/*
+ *************************************************************************
@@ -82478,7 +82477,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+#endif // CARRIER_DETECTION_SUPPORT //
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/sta/rtmp_data.c
++++ b/drivers/staging/rt2860/sta/rtmp_data.c
@@ -0,0 +1,2614 @@
+/*
+ *************************************************************************
@@ -85095,7 +85094,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+}
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/sta/sanity.c
++++ b/drivers/staging/rt2860/sta/sanity.c
@@ -0,0 +1,420 @@
+/*
+ *************************************************************************
@@ -85518,7 +85517,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+}
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/sta/sync.c
++++ b/drivers/staging/rt2860/sta/sync.c
@@ -0,0 +1,1961 @@
+/*
+ *************************************************************************
@@ -87482,7 +87481,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+}
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/sta/wpa.c
++++ b/drivers/staging/rt2860/sta/wpa.c
@@ -0,0 +1,2086 @@
+/*
+ *************************************************************************
@@ -89571,11 +89570,11 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+}
+
--- /dev/null
-+++ b/drivers/staging/rtl2860/TODO
++++ b/drivers/staging/rt2860/TODO
@@ -0,0 +1,17 @@
+I'm hesitant to add a TODO file here, as the wireless developers would
-+really have people help them out on the "clean" rtl2860 driver that can
-+be found at the rtl2860.sf.net site.
++really have people help them out on the "clean" rt2860 driver that can
++be found at the rt2860.sf.net site.
+
+But, if you wish to clean up this driver instead, here's a short list of
+things that need to be done to get it into a more mergable shape:
@@ -89591,7 +89590,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+Kroah-Hartman <greg@kroah.com> and don't bother the upstream wireless
+kernel developers about it, they want nothing to do with it.
--- /dev/null
-+++ b/drivers/staging/rtl2860/wpa.h
++++ b/drivers/staging/rt2860/wpa.h
@@ -0,0 +1,356 @@
+/*
+ *************************************************************************