updated on Mon Jan 23 04:00:55 UTC 2012
[aur-mirror.git] / rt3070ap / rt3070.patch
blobaf5c8e1672589c059cf37b404bb580b548252353
1 diff -wbBur 2010_0203_RT3070_SoftAP_v2.4.0.1_DPA/MODULE/common/rtmp_init.c 2010_0203_RT3070_SoftAP_v2.4.0.1_DPA.my/MODULE/common/rtmp_init.c
2 --- 2010_0203_RT3070_SoftAP_v2.4.0.1_DPA/MODULE/common/rtmp_init.c 2010-01-28 08:23:46.000000000 +0300
3 +++ 2010_0203_RT3070_SoftAP_v2.4.0.1_DPA.my/MODULE/common/rtmp_init.c 2011-01-02 00:47:29.596666668 +0300
4 @@ -5239,7 +5239,7 @@
5 #ifdef OS_ABL_SUPPORT
7 #ifdef RTMP_MAC_USB
8 -MODULE_LICENSE("RALINK");
9 +MODULE_LICENSE("GPL");
10 #endif // RTMP_MAC_USB //
12 EXPORT_SYMBOL(NICInitializeAdapter);
13 diff -wbBur 2010_0203_RT3070_SoftAP_v2.4.0.1_DPA/MODULE/include/os/rt_linux.h 2010_0203_RT3070_SoftAP_v2.4.0.1_DPA.my/MODULE/include/os/rt_linux.h
14 --- 2010_0203_RT3070_SoftAP_v2.4.0.1_DPA/MODULE/include/os/rt_linux.h 2010-02-03 08:59:36.000000000 +0300
15 +++ 2010_0203_RT3070_SoftAP_v2.4.0.1_DPA.my/MODULE/include/os/rt_linux.h 2011-01-02 00:47:14.260000002 +0300
16 @@ -1082,8 +1082,8 @@
17 #define RT28XX_PUT_DEVICE usb_put_dev
18 #define RTUSB_ALLOC_URB(iso) usb_alloc_urb(iso, GFP_ATOMIC)
19 #define RTUSB_SUBMIT_URB(pUrb) usb_submit_urb(pUrb, GFP_ATOMIC)
20 -#define RTUSB_URB_ALLOC_BUFFER(pUsb_Dev, BufSize, pDma_addr) usb_buffer_alloc(pUsb_Dev, BufSize, GFP_ATOMIC, pDma_addr)
21 -#define RTUSB_URB_FREE_BUFFER(pUsb_Dev, BufSize, pTransferBuf, Dma_addr) usb_buffer_free(pUsb_Dev, BufSize, pTransferBuf, Dma_addr)
22 +#define RTUSB_URB_ALLOC_BUFFER(pUsb_Dev, BufSize, pDma_addr) usb_alloc_coherent(pUsb_Dev, BufSize, GFP_ATOMIC, pDma_addr)
23 +#define RTUSB_URB_FREE_BUFFER(pUsb_Dev, BufSize, pTransferBuf, Dma_addr) usb_free_coherent(pUsb_Dev, BufSize, pTransferBuf, Dma_addr)
24 #else
26 #define RT28XX_PUT_DEVICE rausb_put_dev
27 diff -wbBur 2010_0203_RT3070_SoftAP_v2.4.0.1_DPA/MODULE/Makefile 2010_0203_RT3070_SoftAP_v2.4.0.1_DPA.my/MODULE/Makefile
28 --- 2010_0203_RT3070_SoftAP_v2.4.0.1_DPA/MODULE/Makefile 2010-01-28 08:23:50.000000000 +0300
29 +++ 2010_0203_RT3070_SoftAP_v2.4.0.1_DPA.my/MODULE/Makefile 2011-01-02 00:47:14.260000002 +0300
30 @@ -217,15 +217,15 @@
31 $(MAKE) -C $(RT28xx_DIR)/os/linux/
33 ifeq ($(RT28xx_MODE),AP)
34 - cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.o /tftpboot
35 + -cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.o /tftpboot
36 ifeq ($(PLATFORM),INF_AMAZON_SE)
37 - cp -f /tftpboot/rt2870ap.o /backup/ifx/build/root_filesystem/lib/modules/2.4.31-Amazon_SE-3.6.2.2-R0416_Ralink/kernel/drivers/net
38 + -cp -f /tftpboot/rt2870ap.o /backup/ifx/build/root_filesystem/lib/modules/2.4.31-Amazon_SE-3.6.2.2-R0416_Ralink/kernel/drivers/net
39 endif
40 else
41 ifeq ($(RT28xx_MODE),APSTA)
42 - cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.o /tftpboot
43 + -cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.o /tftpboot
44 else
45 - cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.o /tftpboot
46 + -cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.o /tftpboot
47 endif
48 endif
49 else
50 @@ -242,14 +242,14 @@
51 endif
53 ifeq ($(RT28xx_MODE),AP)
54 - cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.ko /tftpboot
55 + -cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.ko /tftpboot
56 # rm -f os/linux/rt2860ap.ko.lzma
57 # /root/bin/lzma e os/linux/rt$(CHIPSET)ap.ko os/linux/rt$(CHIPSET)ap.ko.lzma
58 else
59 ifeq ($(RT28xx_MODE),APSTA)
60 - cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.ko /tftpboot
61 + -cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.ko /tftpboot
62 else
63 - cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot
64 + -cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot
65 endif
66 endif
67 endif
68 diff -wbBur 2010_0203_RT3070_SoftAP_v2.4.0.1_DPA/MODULE/os/linux/modules.order 2010_0203_RT3070_SoftAP_v2.4.0.1_DPA.my/MODULE/os/linux/modules.order
69 --- 2010_0203_RT3070_SoftAP_v2.4.0.1_DPA/MODULE/os/linux/modules.order 2010-01-28 08:23:44.000000000 +0300
70 +++ 2010_0203_RT3070_SoftAP_v2.4.0.1_DPA.my/MODULE/os/linux/modules.order 2011-01-02 00:48:16.516666668 +0300
71 @@ -1 +1 @@
72 -kernel//home/Ralink/SWRelease_RT3070STA/RT_WIFI_20091120_RT3070STA_release/os/linux/rtnet3070sta.ko
73 +kernel//home/sergej/aur.i/rt3070ap/src/2010_0203_RT3070_SoftAP_v2.4.0.1_DPA/MODULE/os/linux/rt3070ap.ko
74 diff -wbBur 2010_0203_RT3070_SoftAP_v2.4.0.1_DPA/NETIF/include/os/rt_linux.h 2010_0203_RT3070_SoftAP_v2.4.0.1_DPA.my/NETIF/include/os/rt_linux.h
75 --- 2010_0203_RT3070_SoftAP_v2.4.0.1_DPA/NETIF/include/os/rt_linux.h 2010-02-03 09:00:16.000000000 +0300
76 +++ 2010_0203_RT3070_SoftAP_v2.4.0.1_DPA.my/NETIF/include/os/rt_linux.h 2011-01-02 00:47:14.260000002 +0300
77 @@ -1082,8 +1082,8 @@
78 #define RT28XX_PUT_DEVICE usb_put_dev
79 #define RTUSB_ALLOC_URB(iso) usb_alloc_urb(iso, GFP_ATOMIC)
80 #define RTUSB_SUBMIT_URB(pUrb) usb_submit_urb(pUrb, GFP_ATOMIC)
81 -#define RTUSB_URB_ALLOC_BUFFER(pUsb_Dev, BufSize, pDma_addr) usb_buffer_alloc(pUsb_Dev, BufSize, GFP_ATOMIC, pDma_addr)
82 -#define RTUSB_URB_FREE_BUFFER(pUsb_Dev, BufSize, pTransferBuf, Dma_addr) usb_buffer_free(pUsb_Dev, BufSize, pTransferBuf, Dma_addr)
83 +#define RTUSB_URB_ALLOC_BUFFER(pUsb_Dev, BufSize, pDma_addr) usb_alloc_coherent(pUsb_Dev, BufSize, GFP_ATOMIC, pDma_addr)
84 +#define RTUSB_URB_FREE_BUFFER(pUsb_Dev, BufSize, pTransferBuf, Dma_addr) usb_free_coherent(pUsb_Dev, BufSize, pTransferBuf, Dma_addr)
85 #else
87 #define RT28XX_PUT_DEVICE rausb_put_dev
88 diff -wbBur 2010_0203_RT3070_SoftAP_v2.4.0.1_DPA/NETIF/os/linux/rt_main_dev.c 2010_0203_RT3070_SoftAP_v2.4.0.1_DPA.my/NETIF/os/linux/rt_main_dev.c
89 --- 2010_0203_RT3070_SoftAP_v2.4.0.1_DPA/NETIF/os/linux/rt_main_dev.c 2010-01-28 08:23:52.000000000 +0300
90 +++ 2010_0203_RT3070_SoftAP_v2.4.0.1_DPA.my/NETIF/os/linux/rt_main_dev.c 2011-01-02 00:47:14.260000002 +0300
91 @@ -47,9 +47,9 @@
92 MODULE_PARM_DESC (mac, "rt28xx: wireless mac addr");
94 #ifdef OS_ABL_SUPPORT
95 -#ifdef RTMP_MAC_USB
96 +//#ifdef RTMP_MAC_USB
97 MODULE_LICENSE("GPL");
98 -#endif // RTMP_MAC_USB //
99 +//#endif // RTMP_MAC_USB //
101 UCHAR ZERO_MAC_ADDR[MAC_ADDR_LEN] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
102 #endif // OS_ABL_SUPPORT //
103 diff -wbBur 2010_0203_RT3070_SoftAP_v2.4.0.1_DPA/UTIL/include/os/rt_linux.h 2010_0203_RT3070_SoftAP_v2.4.0.1_DPA.my/UTIL/include/os/rt_linux.h
104 --- 2010_0203_RT3070_SoftAP_v2.4.0.1_DPA/UTIL/include/os/rt_linux.h 2010-02-03 08:59:58.000000000 +0300
105 +++ 2010_0203_RT3070_SoftAP_v2.4.0.1_DPA.my/UTIL/include/os/rt_linux.h 2011-01-02 00:47:14.260000002 +0300
106 @@ -1082,8 +1082,8 @@
107 #define RT28XX_PUT_DEVICE usb_put_dev
108 #define RTUSB_ALLOC_URB(iso) usb_alloc_urb(iso, GFP_ATOMIC)
109 #define RTUSB_SUBMIT_URB(pUrb) usb_submit_urb(pUrb, GFP_ATOMIC)
110 -#define RTUSB_URB_ALLOC_BUFFER(pUsb_Dev, BufSize, pDma_addr) usb_buffer_alloc(pUsb_Dev, BufSize, GFP_ATOMIC, pDma_addr)
111 -#define RTUSB_URB_FREE_BUFFER(pUsb_Dev, BufSize, pTransferBuf, Dma_addr) usb_buffer_free(pUsb_Dev, BufSize, pTransferBuf, Dma_addr)
112 +#define RTUSB_URB_ALLOC_BUFFER(pUsb_Dev, BufSize, pDma_addr) usb_alloc_coherent(pUsb_Dev, BufSize, GFP_ATOMIC, pDma_addr)
113 +#define RTUSB_URB_FREE_BUFFER(pUsb_Dev, BufSize, pTransferBuf, Dma_addr) usb_free_coherent(pUsb_Dev, BufSize, pTransferBuf, Dma_addr)
114 #else
116 #define RT28XX_PUT_DEVICE rausb_put_dev
117 diff -wbBur 2010_0203_RT3070_SoftAP_v2.4.0.1_DPA/UTIL/os/linux/rt_linux.c 2010_0203_RT3070_SoftAP_v2.4.0.1_DPA.my/UTIL/os/linux/rt_linux.c
118 --- 2010_0203_RT3070_SoftAP_v2.4.0.1_DPA/UTIL/os/linux/rt_linux.c 2010-01-28 08:23:50.000000000 +0300
119 +++ 2010_0203_RT3070_SoftAP_v2.4.0.1_DPA.my/UTIL/os/linux/rt_linux.c 2011-01-02 00:47:14.263333335 +0300
120 @@ -2,11 +2,11 @@
122 ULONG RTDebugLevel = RT_DEBUG_ERROR;
124 -#ifdef RTMP_MAC_USB
125 -#ifdef OS_ABL_SUPPORT
126 +//#ifdef RTMP_MAC_USB
127 +//#ifdef OS_ABL_SUPPORT
128 MODULE_LICENSE("GPL");
129 -#endif // OS_ABL_SUPPORT //
130 -#endif // RTMP_MAC_USB //
131 +//#endif // OS_ABL_SUPPORT //
132 +//#endif // RTMP_MAC_USB //
134 #ifdef SYSTEM_LOG_SUPPORT
135 // for wireless system event message
136 diff -wbBur 2010_0203_RT3070_SoftAP_v2.4.0.1_DPA/UTIL/os/linux/rt_usb_util.c 2010_0203_RT3070_SoftAP_v2.4.0.1_DPA.my/UTIL/os/linux/rt_usb_util.c
137 --- 2010_0203_RT3070_SoftAP_v2.4.0.1_DPA/UTIL/os/linux/rt_usb_util.c 2010-01-28 08:23:50.000000000 +0300
138 +++ 2010_0203_RT3070_SoftAP_v2.4.0.1_DPA.my/UTIL/os/linux/rt_usb_util.c 2011-01-02 00:47:14.263333335 +0300
139 @@ -123,7 +123,7 @@
140 gfp_t mem_flags,
141 dma_addr_t *dma)
143 - return usb_buffer_alloc(dev, size, mem_flags, dma);
144 + return usb_alloc_coherent(dev, size, mem_flags, dma);
146 EXPORT_SYMBOL(rausb_buffer_alloc);
148 @@ -133,7 +133,7 @@
149 void *addr,
150 dma_addr_t dma)
152 - usb_buffer_free(dev, size, addr, dma);
153 + usb_free_coherent(dev, size, addr, dma);
155 EXPORT_SYMBOL(rausb_buffer_free);
156 #endif // LINUX_VERSION_CODE //