diff options
Diffstat (limited to 'target/linux/realtek/patches-2.6.30')
-rw-r--r-- | target/linux/realtek/patches-2.6.30/003-include-paths.diff | 13 | ||||
-rw-r--r-- | target/linux/realtek/patches-2.6.30/004-rtl8192cd-fixes.diff | 37 | ||||
-rw-r--r-- | target/linux/realtek/patches-2.6.30/004-stop-gcc-dying.diff | 26 | ||||
-rw-r--r-- | target/linux/realtek/patches-2.6.30/8192cd-fix-private-ioctls.patch | 37 | ||||
-rw-r--r-- | target/linux/realtek/patches-2.6.30/8192cd-make-net80211-debuggable.patch | 31 | ||||
-rw-r--r-- | target/linux/realtek/patches-2.6.30/9995-net-rtl819x-include-paths.patch (renamed from target/linux/realtek/patches-2.6.30/9995-net-include-paths-fix.patch) | 0 |
6 files changed, 37 insertions, 107 deletions
diff --git a/target/linux/realtek/patches-2.6.30/003-include-paths.diff b/target/linux/realtek/patches-2.6.30/003-include-paths.diff index c1351ec67..341cbe8f2 100644 --- a/target/linux/realtek/patches-2.6.30/003-include-paths.diff +++ b/target/linux/realtek/patches-2.6.30/003-include-paths.diff @@ -19,19 +19,6 @@ index 7a08142..cfd0152 100644 #obj-y := rtl_glue.o #Add mips16 Support -diff --git a/drivers/net/wireless/rtl8192cd/Makefile b/drivers/net/wireless/rtl8192cd/Makefile -index 33ef469..51cff6b 100644 ---- a/drivers/net/wireless/rtl8192cd/Makefile -+++ b/drivers/net/wireless/rtl8192cd/Makefile -@@ -35,6 +35,8 @@ ifeq ($(CONFIG_RTL_MESH_SUPPORT),y) - ../mesh_ext/hash_table.o - endif - -+EXTRA_CFLAGS += -I$(TOPDIR)/arch/rlx -+ - fwext=binfw - SRCS_TXT = $(addprefix $(src)/data_,$(notdir $(patsubst %.txt,%.c,$(wildcard $(src)/$(RTL_WLAN_DATA_DIR)/*.txt)))) - SRCS_BIN = $(addprefix $(src)/data_,$(notdir $(patsubst %.bin,%.c,$(wildcard $(src)/$(RTL_WLAN_DATA_DIR)/*.bin)))) diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile index 9e62ed1..19afd87 100644 --- a/drivers/usb/host/Makefile diff --git a/target/linux/realtek/patches-2.6.30/004-rtl8192cd-fixes.diff b/target/linux/realtek/patches-2.6.30/004-rtl8192cd-fixes.diff new file mode 100644 index 000000000..0f5209d49 --- /dev/null +++ b/target/linux/realtek/patches-2.6.30/004-rtl8192cd-fixes.diff @@ -0,0 +1,37 @@ +--- a/drivers/net/wireless/rtl8192cd/8192cd_cfg.h ++++ b/drivers/net/wireless/rtl8192cd/8192cd_cfg.h +@@ -1826,6 +1826,13 @@ + #undef CONFIG_RTK_VLAN_SUPPORT + #endif + ++#undef __DRAM_IN_865X ++#undef __IRAM_IN_865X ++#undef __MIPS16 ++ ++#define __DRAM_IN_865X ++#define __IRAM_IN_865X ++#define __MIPS16 + + #endif // _8192CD_CFG_H_ + +--- a/drivers/net/wireless/rtl8192cd/Makefile ++++ b/drivers/net/wireless/rtl8192cd/Makefile +@@ -4,6 +4,7 @@ + # Makefile for the Linux Wireless network device drivers. + # + ++EXTRA_CFLAGS += -I$(TOPDIR)/arch/rlx + + ifeq ($(CONFIG_RTL_92C_SUPPORT),y) + RTL_WLAN_DATA_DIR := data +--- a/drivers/net/wireless/rtl8192cd/8192cd_headers.h ++++ b/drivers/net/wireless/rtl8192cd/8192cd_headers.h +@@ -1454,7 +1454,7 @@ + #undef EXTERN + + +-#if 0 ++#if 1 + + /*----------------------------------------------------------------------------- + 8192cd_net80211.c diff --git a/target/linux/realtek/patches-2.6.30/004-stop-gcc-dying.diff b/target/linux/realtek/patches-2.6.30/004-stop-gcc-dying.diff deleted file mode 100644 index 2520ab42e..000000000 --- a/target/linux/realtek/patches-2.6.30/004-stop-gcc-dying.diff +++ /dev/null @@ -1,26 +0,0 @@ -commit 91f39c0015a2c181f259487f0ce99fab8d5c3eea -Author: Roman Yeryomin <roman@advem.lv> -Date: Tue Feb 5 01:44:08 2013 +0200 - - adopt 004-stop-gcc-dying.diff - - Signed-off-by: Roman Yeryomin <roman@advem.lv> - -diff --git a/drivers/net/wireless/rtl8192cd/8192cd_cfg.h b/drivers/net/wireless/rtl8192cd/8192cd_cfg.h -index 7da9174..ae02e5a 100644 ---- a/drivers/net/wireless/rtl8192cd/8192cd_cfg.h -+++ b/drivers/net/wireless/rtl8192cd/8192cd_cfg.h -@@ -1826,6 +1826,13 @@ - #undef CONFIG_RTK_VLAN_SUPPORT - #endif - -+#undef __DRAM_IN_865X -+#undef __IRAM_IN_865X -+#undef __MIPS16 -+ -+#define __DRAM_IN_865X -+#define __IRAM_IN_865X -+#define __MIPS16 - - #endif // _8192CD_CFG_H_ - diff --git a/target/linux/realtek/patches-2.6.30/8192cd-fix-private-ioctls.patch b/target/linux/realtek/patches-2.6.30/8192cd-fix-private-ioctls.patch deleted file mode 100644 index 0f140fb43..000000000 --- a/target/linux/realtek/patches-2.6.30/8192cd-fix-private-ioctls.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- linux-2.6.30.9/drivers/net/wireless/rtl8192cd/8192cd_ioctl.c 2013-06-29 15:37:41.982461999 +0300 -+++ linux-2.6.30.9/drivers/net/wireless/rtl8192cd/8192cd_ioctl.c 2013-07-01 17:53:46.747055454 +0300 -@@ -1537,19 +1537,26 @@ - - static struct iwpriv_arg *get_tbl_entry(char *pstr) - { -- int i=0; -+ if ( !pstr ) -+ return NULL; -+ -+ int i = 0; - int arg_num = sizeof(mib_table)/sizeof(struct iwpriv_arg); -- char name[128]; -+ char name[sizeof(mib_table[i].name)]; -+ memset( name, 0, sizeof name ); - -- while (*pstr && *pstr != '=') -- name[i++] = *pstr++; -- name[i] = '\0'; -+ for ( *pstr; i < sizeof(name); *pstr++ ) { -+ if ( *pstr == '=') -+ break; -+ name[i] = *pstr; -+ i++; -+ } - -- for (i=0; i<arg_num; i++) { -- if (!strcmp(name, mib_table[i].name)) { -+ for ( i = 0; i < arg_num; i++ ) { -+ if ( !strncmp( name, mib_table[i].name, sizeof(name) ) ) - return &mib_table[i]; -- } - } -+ - return NULL; - } - diff --git a/target/linux/realtek/patches-2.6.30/8192cd-make-net80211-debuggable.patch b/target/linux/realtek/patches-2.6.30/8192cd-make-net80211-debuggable.patch deleted file mode 100644 index 872fb6ed1..000000000 --- a/target/linux/realtek/patches-2.6.30/8192cd-make-net80211-debuggable.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- linux-2.6.30.9/drivers/net/wireless/rtl8192cd/8192cd_debug.h 2013-06-29 15:37:41.974461999 +0300 -+++ linux-2.6.30.9/drivers/net/wireless/rtl8192cd/8192cd_debug.h 2013-06-29 17:09:39.338236185 +0300 -@@ -64,6 +64,7 @@ - _DM_ = 0x00100000, - _88E_HW_ = 0x00200000, - _DFS_ = 0x00400000, -+ _NET80211_ = 0x00800000, - _MESH_SME_ = 0x02000000, - _MESH_SECURITY_ = 0x04000000, - _MESH_TX_ = 0x08000000, -@@ -77,6 +78,10 @@ - #define _MODULE_DEFINE _OSDEP_ - #define _MODULE_NAME "osdep" - -+#elif defined(_8192CD_NET80211_C_) -+ #define _MODULE_DEFINE _NET80211_ -+ #define _MODULE_NAME "net80211" -+ - #elif defined(_8192CD_SME_C_) - #define _MODULE_DEFINE _SME_ - #define _MODULE_NAME "sme" ---- linux-2.6.30.9/drivers/net/wireless/rtl8192cd/8192cd_net80211.c 2013-06-29 15:37:41.982461999 +0300 -+++ linux-2.6.30.9/drivers/net/wireless/rtl8192cd/8192cd_net80211.c 2013-06-29 17:00:44.566258072 +0300 -@@ -9,6 +9,7 @@ - * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-+#define _8192CD_NET80211_C_ -
- #ifdef __KERNEL__
- #include <linux/module.h>
diff --git a/target/linux/realtek/patches-2.6.30/9995-net-include-paths-fix.patch b/target/linux/realtek/patches-2.6.30/9995-net-rtl819x-include-paths.patch index 2710b56cc..2710b56cc 100644 --- a/target/linux/realtek/patches-2.6.30/9995-net-include-paths-fix.patch +++ b/target/linux/realtek/patches-2.6.30/9995-net-rtl819x-include-paths.patch |