Advertisement
Guest User

Patch for DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217

a guest
Jan 11th, 2013
425
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 28.93 KB | None | 0 0
  1. diff -rub DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/common/cmm_asic.c DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/common/cmm_asic.c
  2. --- DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/common/cmm_asic.c   2010-12-17 12:44:47.000000000 +0100
  3. +++ DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/common/cmm_asic.c   2012-12-06 09:51:34.000000000 +0100
  4. @@ -3244,7 +3244,7 @@
  5.     PUCHAR          ptr;
  6.     UINT i;
  7.     ULONG beaconBaseLocation = 0;
  8. -   USHORT          beaconLen = pAd->BeaconTxWI.MPDUtotalByteCount;
  9. +   USHORT          beaconLen;
  10.  #ifdef SPECIFIC_BCN_BUF_SUPPORT   
  11.     unsigned long irqFlag;
  12.  #endif // SPECIFIC_BCN_BUF_SUPPORT //
  13. @@ -3255,7 +3255,10 @@
  14.     NdisMoveMemory((PUCHAR)&localTxWI, (PUCHAR)&pAd->BeaconTxWI, TXWI_SIZE);
  15.     RTMPWIEndianChange((PUCHAR)&localTxWI, TYPE_TXWI);
  16.     beaconLen = localTxWI.MPDUtotalByteCount;
  17. +#else
  18. +   beaconLen = pAd->BeaconTxWI.MPDUtotalByteCount;
  19.  #endif // RT_BIG_ENDIAN //
  20. +   (void)beaconLen;    /* avoid compiler warning -Wunused-variable */
  21.  
  22.     DBGPRINT(RT_DEBUG_TRACE, ("--->AsicEnableIbssSync(MPDUtotalByteCount=%d, beaconLen=%d)\n", pAd->BeaconTxWI.MPDUtotalByteCount, beaconLen));
  23.  
  24. @@ -3985,6 +3988,7 @@
  25.     RTMP_MAC_SHR_MSEL_LOCK(pAd, LOWER_SHRMEM, irqFlag);
  26.  #endif // SPECIFIC_BCN_BUF_SUPPORT //
  27.    
  28. +   (void)CipherAlg;    /* avoid compiler warning -Wunused-variable */
  29.     // EKEY
  30.     offset = PAIRWISE_KEY_TABLE_BASE + (WCID * HW_KEY_ENTRY_SIZE);
  31.  #ifdef RTMP_MAC_PCI
  32. diff -rub DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/common/cmm_wpa.c DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/common/cmm_wpa.c
  33. --- DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/common/cmm_wpa.c    2010-12-17 12:44:47.000000000 +0100
  34. +++ DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/common/cmm_wpa.c    2013-01-10 17:44:19.229223296 +0100
  35. @@ -1108,6 +1108,8 @@
  36.      BOOLEAN             Cancelled;
  37.     UCHAR               group_cipher = Ndis802_11WEPDisabled;
  38.  
  39. +   (void)group_cipher; /* avoid compiler warning -Wunused-variable */
  40. +
  41.      DBGPRINT(RT_DEBUG_TRACE, ("===> PeerPairMsg4Action\n"));
  42.  
  43.      do
  44. @@ -1454,6 +1456,8 @@
  45.     PEAPOL_PACKET       pMsg2; 
  46.     UCHAR               group_cipher = Ndis802_11WEPDisabled;  
  47.  
  48. +   (void)group_cipher; /* avoid compiler warning -Wunused-variable */
  49. +
  50.     DBGPRINT(RT_DEBUG_TRACE, ("===> PeerGroupMsg2Action \n"));
  51.  
  52.      if ((!pEntry) || !IS_ENTRY_CLIENT(pEntry))
  53. @@ -2410,7 +2414,7 @@
  54.     UCHAR       PrimaryRsnie;          
  55.     BOOLEAN     bMixCipher = FALSE; // indicate the pairwise and group cipher are different
  56.     UCHAR       p_offset;      
  57. -   WPA_MIX_PAIR_CIPHER     FlexibleCipher = MIX_CIPHER_NOTUSE; // it provide the more flexible cipher combination in WPA-WPA2 and TKIPAES mode
  58. +   WPA_MIX_PAIR_CIPHER     FlexibleCipher = WPA_TKIPAES_WPA2_TKIPAES;  // it provide the more flexible cipher combination in WPA-WPA2 and TKIPAES mode
  59.        
  60.     rsnielen_cur_p = NULL;
  61.     rsnielen_ex_cur_p = NULL;
  62. diff -rub DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/common/crypt_md5.c DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/common/crypt_md5.c
  63. --- DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/common/crypt_md5.c  2010-12-17 12:44:47.000000000 +0100
  64. +++ DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/common/crypt_md5.c  2012-12-06 10:10:47.000000000 +0100
  65. @@ -319,7 +319,7 @@
  66.  
  67.      NdisMoveMemory((UCHAR *)Digest, (ULONG *)pCtx->Buf, 16); // output
  68.      byteReverse((UCHAR *)Digest, 4);
  69. -    NdisZeroMemory(pCtx, sizeof(pCtx)); // memory free
  70. +    NdisZeroMemory(pCtx, sizeof(*pCtx)); // memory free
  71.  }
  72.  
  73.  
  74. @@ -618,7 +618,7 @@
  75.          Digest [i] = (UCHAR)(pCtx->Buf[i>>2] >> 8*(3-(i & 0x3)));
  76.      }
  77.      
  78. -    NdisZeroMemory(pCtx, sizeof(pCtx)); // memory free
  79. +    NdisZeroMemory(pCtx, sizeof(*pCtx)); // memory free
  80.  }
  81.  
  82.  
  83. diff -rub DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/common/mlme.c DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/common/mlme.c
  84. --- DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/common/mlme.c   2010-12-17 12:44:47.000000000 +0100
  85. +++ DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/common/mlme.c   2012-12-06 10:12:07.000000000 +0100
  86. @@ -865,8 +865,8 @@
  87.  
  88.     /* for performace enchanement */
  89.     NdisZeroMemory(&pAd->RalinkCounters,
  90. -                   (UINT32)&pAd->RalinkCounters.OneSecEnd -
  91. -                   (UINT32)&pAd->RalinkCounters.OneSecStart);
  92. +                   (UINT32)(&pAd->RalinkCounters.OneSecEnd -
  93. +                            &pAd->RalinkCounters.OneSecStart));
  94.  
  95.     return;
  96.  }
  97. @@ -5654,7 +5654,7 @@
  98.                     BssEntrySet(pAd, &Tab->BssEntry[Idx], pBssid, Ssid, SsidLen, BssType, BeaconPeriod, CfParm, AtimWin,
  99.                         CapabilityInfo, SupRate, SupRateLen, ExtRate, ExtRateLen,pHtCapability, pAddHtInfo,HtCapabilityLen, AddHtInfoLen,
  100.                         NewExtChanOffset, ChannelNo, Rssi, TimeStamp, CkipFlag, pEdcaParm, pQosCapability, pQbssLoad, LengthVIE, pVIE);
  101. -                    Tab->BssOverlapNr = (Tab->BssOverlapNr++) % MAX_LEN_OF_BSS_TABLE;
  102. +                    Tab->BssOverlapNr = (Tab->BssOverlapNr + 1) % MAX_LEN_OF_BSS_TABLE;
  103.                 }
  104.                 return Idx;
  105.             }
  106. diff -rub DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/common/rtmp_init.c DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/common/rtmp_init.c
  107. --- DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/common/rtmp_init.c  2010-12-17 12:44:47.000000000 +0100
  108. +++ DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/common/rtmp_init.c  2012-12-06 09:46:01.000000000 +0100
  109. @@ -1388,7 +1388,7 @@
  110.             UINT32 FormalVersion;
  111.  
  112.             FormalVersion = ((pAd->EepromVersion & 0x0f) << 8) + (pAd->EepromVersion >> 8);
  113. -           printk("FormalVersion=0x%x, pAd->EepromVersion=0x%x!\n", FormalVersion, pAd->EepromVersion);
  114. +           printk("FormalVersion=0x%x, pAd->EepromVersion=0x%lx!\n", FormalVersion, pAd->EepromVersion);
  115.             if (FormalVersion >= 0x0201)
  116.             {
  117.                 WM_COEX_SET_FLAG(pAd, fWM_GPIO4_ACTIVE_HIGH);
  118. diff -rub DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/include/firmware.h DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/include/firmware.h
  119. --- DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/include/firmware.h  2010-12-17 12:44:47.000000000 +0100
  120. +++ DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/include/firmware.h  2013-01-10 17:45:39.992823465 +0100
  121. @@ -1,45 +1,5 @@
  122. -/*
  123. - *************************************************************************
  124. -Copyright (c) 2010, Ralink Technology Corporation
  125. -All rights reserved.
  126. -
  127. -Redistribution. Redistribution and use in binary form, without
  128. -modification, are permitted provided that the following conditions are
  129. -met:
  130. -
  131. -* Redistributions must reproduce the above copyright notice and the
  132. -  following disclaimer in the documentation and/or other materials
  133. -  provided with the distribution.
  134. -* Neither the name of Ralink Technology Corporation nor the names of its
  135. -  suppliers may be used to endorse or promote products derived from this
  136. -  software without specific prior written permission.
  137. -* No reverse engineering, decompilation, or disassembly of this software
  138. -  is permitted.
  139. -
  140. -Limited patent license. Ralink Technology Corporation grants a world-wide,
  141. -royalty-free, non-exclusive license under patents it now or hereafter
  142. -owns or controls to make, have made, use, import, offer to sell and
  143. -sell ("Utilize") this software, but solely to the extent that any
  144. -such patent is necessary to Utilize the software alone, or in
  145. -combination with an operating system licensed under an approved Open
  146. -Source license as listed by the Open Source Initiative at
  147. -http://opensource.org/licenses.  The patent license shall not apply to
  148. -any other combinations which include this software.  No hardware per
  149. -se is licensed hereunder.
  150. -
  151. -DISCLAIMER.  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  152. -CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
  153. -BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
  154. -FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
  155. -COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
  156. -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
  157. -BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
  158. -OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  159. -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
  160. -TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
  161. -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  162. -DAMAGE.
  163. - *************************************************************************/
  164. +/* AUTO GEN PLEASE DO NOT MODIFY IT */
  165. +/* AUTO GEN PLEASE DO NOT MODIFY IT */
  166.  
  167.  
  168.  UCHAR FirmwareImage [] = {
  169. diff -rub DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/include/os/rt_linux.h DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/include/os/rt_linux.h
  170. --- DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/include/os/rt_linux.h   2010-12-17 12:44:47.000000000 +0100
  171. +++ DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/include/os/rt_linux.h   2013-01-09 11:24:41.134069403 +0100
  172. @@ -943,15 +943,16 @@
  173.         (RTPKT_TO_OSPKT(_pkt)->len) = (_len)
  174.        
  175.  #define GET_OS_PKT_DATATAIL(_pkt) \
  176. -       (RTPKT_TO_OSPKT(_pkt)->tail)
  177. +       (skb_tail_pointer(RTPKT_TO_OSPKT(_pkt)))
  178.  #define SET_OS_PKT_DATATAIL(_pkt, _start, _len)    \
  179. -       ((RTPKT_TO_OSPKT(_pkt))->tail) = (PUCHAR)((_start) + (_len))
  180. +       (SET_OS_PKT_DATAPTR(_pkt, _start), \
  181. +           skb_set_tail_pointer(RTPKT_TO_OSPKT(_pkt), (_len)))
  182.        
  183.  #define GET_OS_PKT_HEAD(_pkt) \
  184.         (RTPKT_TO_OSPKT(_pkt)->head)
  185.  
  186.  #define GET_OS_PKT_END(_pkt) \
  187. -       (RTPKT_TO_OSPKT(_pkt)->end)
  188. +       (skb_end_pointer(RTPKT_TO_OSPKT(_pkt)))
  189.  
  190.  #define GET_OS_PKT_NETDEV(_pkt) \
  191.         (RTPKT_TO_OSPKT(_pkt)->dev)
  192. Nur in DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched: log.
  193. diff -rub DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/Makefile DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/Makefile
  194. --- DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/Makefile    2010-12-17 12:44:47.000000000 +0100
  195. +++ DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/Makefile    2012-12-06 07:38:17.000000000 +0100
  196. @@ -1,3 +1,4 @@
  197. +UNAME_R = $(shell uname -r)
  198.  RT28xx_MODE = STA
  199.  
  200.  TARGET = LINUX
  201. @@ -139,10 +140,10 @@
  202.  
  203.  ifeq ($(PLATFORM),PC)
  204.  # Linux 2.6
  205. -LINUX_SRC = /lib/modules/$(shell uname -r)/build
  206. +LINUX_SRC = /lib/modules/$(UNAME_R)/build
  207.  # Linux 2.4 Change to your local setting
  208.  #LINUX_SRC = /usr/src/linux-2.4
  209. -LINUX_SRC_MODULE = /lib/modules/$(shell uname -r)/kernel/drivers/net/wireless/
  210. +LINUX_SRC_MODULE = /lib/modules/$(UNAME_R)/kernel/drivers/net/wireless/
  211.  CROSS_COMPILE =
  212.  endif
  213.  
  214. @@ -153,7 +154,7 @@
  215.  
  216.  ifeq ($(PLATFORM),INF_TWINPASS)
  217.  # Linux 2.6
  218. -#LINUX_SRC = /lib/modules/$(shell uname -r)/build
  219. +#LINUX_SRC = /lib/modules/$(UNAME_R)/build
  220.  # Linux 2.4 Change to your local setting
  221.  LINUX_SRC = /project/stable/twinpass/release/2.0.1/source/kernel/opensource/linux-2.4.31/
  222.  CROSS_COMPILE = mips-linux-
  223. @@ -183,7 +184,7 @@
  224.  
  225.  ifeq ($(PLATFORM),INF_AMAZON_SE)
  226.  # Linux 2.6
  227. -#LINUX_SRC = /lib/modules/$(shell uname -r)/build
  228. +#LINUX_SRC = /lib/modules/$(UNAME_R)/build
  229.  # Linux 2.4 Change to your local setting
  230.  LINUX_SRC = /backup/ifx/3.6.2.2/source/kernel/opensource/linux-2.4.31
  231.  #CROSS_COMPILE = mips-linux-
  232. diff -rub DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/os/linux/config.mk DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/os/linux/config.mk
  233. --- DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/os/linux/config.mk  2010-12-17 12:44:47.000000000 +0100
  234. +++ DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/os/linux/config.mk  2012-12-06 07:37:29.000000000 +0100
  235. @@ -9,10 +9,10 @@
  236.  
  237.  
  238.  # Support Wpa_Supplicant
  239. -HAS_WPA_SUPPLICANT=n
  240. +HAS_WPA_SUPPLICANT=y
  241.  
  242.  # Support Native WpaSupplicant for Network Maganger
  243. -HAS_NATIVE_WPA_SUPPLICANT_SUPPORT=n
  244. +HAS_NATIVE_WPA_SUPPLICANT_SUPPORT=y
  245.  
  246.  #Support Net interface block while Tx-Sw queue full
  247.  HAS_BLOCK_NET_IF=n
  248. @@ -109,7 +109,7 @@
  249.  # config for STA mode
  250.  
  251.  ifeq ($(RT28xx_MODE),STA)
  252. -WFLAGS += -DCONFIG_STA_SUPPORT -DDBG
  253. +WFLAGS += -DCONFIG_STA_SUPPORT
  254.  
  255.  ifeq ($(HAS_XLINK),y)
  256.  WFLAGS += -DXLINK_SUPPORT
  257. diff -rub DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/os/linux/Makefile.4 DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/os/linux/Makefile.4
  258. --- DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/os/linux/Makefile.4 2010-12-17 12:44:47.000000000 +0100
  259. +++ DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/os/linux/Makefile.4 2012-12-06 07:42:35.000000000 +0100
  260. @@ -247,25 +247,42 @@
  261.  
  262.  clean:
  263.     rm -f $(RT28xx_DIR)/common/*.o
  264. -   rm -f $(RT28xx_DIR)/common/.*.{cmd,flags,d}
  265. -   rm -f $(RT28xx_DIR)/os/linux/*.{o,ko,mod.{o,c}}
  266. -   rm -f $(RT28xx_DIR)/os/linux/.*.{cmd,flags,d}
  267. +   rm -f $(RT28xx_DIR)/common/.*.cmd
  268. +   rm -f $(RT28xx_DIR)/common/.*.flags
  269. +   rm -f $(RT28xx_DIR)/common/.*.d
  270. +   rm -f $(RT28xx_DIR)/os/linux/*.o,
  271. +   rm -f $(RT28xx_DIR)/os/linux/*.ko
  272. +   rm -f $(RT28xx_DIR)/os/linux/*.mod.o
  273. +   rm -f $(RT28xx_DIR)/os/linux/*.mod.c
  274. +   rm -f $(RT28xx_DIR)/os/linux/.*.cmd
  275. +   rm -f $(RT28xx_DIR)/os/linux/.*.flags
  276. +   rm -f $(RT28xx_DIR)/os/linux/.*.d
  277.     rm -fr $(RT28xx_DIR)/os/linux/.tmp_versions
  278.     rm -f $(RT28xx_DIR)/chips/*.o
  279. -   rm -f $(RT28xx_DIR)/chips/.*.{cmd,flags,d}
  280. +   rm -f $(RT28xx_DIR)/chips/.*.cmd
  281. +   rm -f $(RT28xx_DIR)/chips/.*.flags
  282. +   rm -f $(RT28xx_DIR)/chips/.*.d
  283.  ifeq ($(RT28xx_MODE),AP)
  284.     rm -f $(RT28xx_DIR)/ap/*.o
  285. -   rm -f $(RT28xx_DIR)/ap/.*.{cmd,flags,d}
  286. +   rm -f $(RT28xx_DIR)/ap/.*.cmd
  287. +   rm -f $(RT28xx_DIR)/ap/.*.flags
  288. +   rm -f $(RT28xx_DIR)/ap/.*.d
  289.  else
  290.  ifeq ($(RT28xx_MODE),STA)
  291.     rm -f $(RT28xx_DIR)/sta/*.o
  292. -   rm -f $(RT28xx_DIR)/sta/.*.{cmd,flags,d}
  293. +   rm -f $(RT28xx_DIR)/sta/.*.cmd
  294. +   rm -f $(RT28xx_DIR)/sta/.*.flags
  295. +   rm -f $(RT28xx_DIR)/sta/.*.d
  296.  else
  297.  ifeq ($(RT28xx_MODE),APSTA)
  298.     rm -f $(RT28xx_DIR)/ap/*.o
  299. -   rm -f $(RT28xx_DIR)/ap/.*.{cmd,flags,d}
  300. +   rm -f $(RT28xx_DIR)/ap/.*.cmd
  301. +   rm -f $(RT28xx_DIR)/ap/.*.flags
  302. +   rm -f $(RT28xx_DIR)/ap/.*.d
  303.     rm -f $(RT28xx_DIR)/sta/*.o
  304. -   rm -f $(RT28xx_DIR)/sta/.*.{cmd,flags,d}
  305. +   rm -f $(RT28xx_DIR)/sta/.*.cmd
  306. +   rm -f $(RT28xx_DIR)/sta/.*.flags
  307. +   rm -f $(RT28xx_DIR)/sta/.*.d
  308.  endif
  309.  endif
  310.  endif
  311. diff -rub DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/os/linux/Makefile.4.netif DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/os/linux/Makefile.4.netif
  312. --- DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/os/linux/Makefile.4.netif   2010-12-17 12:44:47.000000000 +0100
  313. +++ DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/os/linux/Makefile.4.netif   2012-12-06 07:44:10.000000000 +0100
  314. @@ -322,25 +322,42 @@
  315.  
  316.  clean:
  317.     rm -f $(RT28xx_DIR)/common/*.o
  318. -   rm -f $(RT28xx_DIR)/common/.*.{cmd,flags,d}
  319. -   rm -f $(RT28xx_DIR)/os/linux/*.{o,ko,mod.{o,c}}
  320. -   rm -f $(RT28xx_DIR)/os/linux/.*.{cmd,flags,d}
  321. +   rm -f $(RT28xx_DIR)/common/.*.cmd
  322. +   rm -f $(RT28xx_DIR)/common/.*.flags
  323. +   rm -f $(RT28xx_DIR)/common/.*.d
  324. +   rm -f $(RT28xx_DIR)/os/linux/*.o
  325. +   rm -f $(RT28xx_DIR)/os/linux/*.ko
  326. +   rm -f $(RT28xx_DIR)/os/linux/*.mod.o
  327. +   rm -f $(RT28xx_DIR)/os/linux/*.mod.c
  328. +   rm -f $(RT28xx_DIR)/os/linux/.*.cmd
  329. +   rm -f $(RT28xx_DIR)/os/linux/.*.flags
  330. +   rm -f $(RT28xx_DIR)/os/linux/.*.d
  331.     rm -fr $(RT28xx_DIR)/os/linux/.tmp_versions
  332.     rm -f $(RT28xx_DIR)/chips/*.o
  333. -   rm -f $(RT28xx_DIR)/chips/.*.{cmd,flags,d}
  334. +   rm -f $(RT28xx_DIR)/chips/.*.cmd
  335. +   rm -f $(RT28xx_DIR)/chips/.*.flags
  336. +   rm -f $(RT28xx_DIR)/chips/.*.d
  337.  ifeq ($(RT28xx_MODE),AP)
  338.     rm -f $(RT28xx_DIR)/ap/*.o
  339. -   rm -f $(RT28xx_DIR)/ap/.*.{cmd,flags,d}
  340. +   rm -f $(RT28xx_DIR)/ap/.*.cmd
  341. +   rm -f $(RT28xx_DIR)/ap/.*.flags
  342. +   rm -f $(RT28xx_DIR)/ap/.*.d
  343.  else
  344.  ifeq ($(RT28xx_MODE),STA)
  345.     rm -f $(RT28xx_DIR)/sta/*.o
  346. -   rm -f $(RT28xx_DIR)/sta/.*.{cmd,flags,d}
  347. +   rm -f $(RT28xx_DIR)/sta/.*.cmd
  348. +   rm -f $(RT28xx_DIR)/sta/.*.flags
  349. +   rm -f $(RT28xx_DIR)/sta/.*.d
  350.  else
  351.  ifeq ($(RT28xx_MODE),APSTA)
  352.     rm -f $(RT28xx_DIR)/ap/*.o
  353. -   rm -f $(RT28xx_DIR)/ap/.*.{cmd,flags,d}
  354. +   rm -f $(RT28xx_DIR)/ap/.*.cmd
  355. +   rm -f $(RT28xx_DIR)/ap/.*.flags
  356. +   rm -f $(RT28xx_DIR)/ap/.*.d
  357.     rm -f $(RT28xx_DIR)/sta/*.o
  358. -   rm -f $(RT28xx_DIR)/sta/.*.{cmd,flags,d}
  359. +   rm -f $(RT28xx_DIR)/sta/.*.cmd
  360. +   rm -f $(RT28xx_DIR)/sta/.*.flags
  361. +   rm -f $(RT28xx_DIR)/sta/.*.d
  362.  endif
  363.  endif
  364.  endif
  365. diff -rub DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/os/linux/Makefile.4.util DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/os/linux/Makefile.4.util
  366. --- DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/os/linux/Makefile.4.util    2010-12-17 12:44:47.000000000 +0100
  367. +++ DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/os/linux/Makefile.4.util    2012-12-06 07:45:29.000000000 +0100
  368. @@ -236,25 +236,42 @@
  369.  
  370.  clean:
  371.     rm -f $(RT28xx_DIR)/common/*.o
  372. -   rm -f $(RT28xx_DIR)/common/.*.{cmd,flags,d}
  373. -   rm -f $(RT28xx_DIR)/os/linux/*.{o,ko,mod.{o,c}}
  374. -   rm -f $(RT28xx_DIR)/os/linux/.*.{cmd,flags,d}
  375. +   rm -f $(RT28xx_DIR)/common/.*.cmd
  376. +   rm -f $(RT28xx_DIR)/common/.*.flags
  377. +   rm -f $(RT28xx_DIR)/common/.*.d
  378. +   rm -f $(RT28xx_DIR)/os/linux/*.o
  379. +   rm -f $(RT28xx_DIR)/os/linux/*.ko
  380. +   rm -f $(RT28xx_DIR)/os/linux/*.mod.o
  381. +   rm -f $(RT28xx_DIR)/os/linux/*.mod.c
  382. +   rm -f $(RT28xx_DIR)/os/linux/.*.cmd
  383. +   rm -f $(RT28xx_DIR)/os/linux/.*.flags
  384. +   rm -f $(RT28xx_DIR)/os/linux/.*.d
  385.     rm -fr $(RT28xx_DIR)/os/linux/.tmp_versions
  386.     rm -f $(RT28xx_DIR)/chips/*.o
  387. -   rm -f $(RT28xx_DIR)/chips/.*.{cmd,flags,d}
  388. +   rm -f $(RT28xx_DIR)/chips/.*.cmd
  389. +   rm -f $(RT28xx_DIR)/chips/.*.flags
  390. +   rm -f $(RT28xx_DIR)/chips/.*.d
  391.  ifeq ($(RT28xx_MODE),AP)
  392.     rm -f $(RT28xx_DIR)/ap/*.o
  393. -   rm -f $(RT28xx_DIR)/ap/.*.{cmd,flags,d}
  394. +   rm -f $(RT28xx_DIR)/ap/.*.cmd
  395. +   rm -f $(RT28xx_DIR)/ap/.*.flags
  396. +   rm -f $(RT28xx_DIR)/ap/.*.d
  397.  else
  398.  ifeq ($(RT28xx_MODE),STA)
  399.     rm -f $(RT28xx_DIR)/sta/*.o
  400. -   rm -f $(RT28xx_DIR)/sta/.*.{cmd,flags,d}
  401. +   rm -f $(RT28xx_DIR)/sta/.*.cmd
  402. +   rm -f $(RT28xx_DIR)/sta/.*.flags
  403. +   rm -f $(RT28xx_DIR)/sta/.*.d
  404.  else
  405.  ifeq ($(RT28xx_MODE),APSTA)
  406.     rm -f $(RT28xx_DIR)/ap/*.o
  407. -   rm -f $(RT28xx_DIR)/ap/.*.{cmd,flags,d}
  408. +   rm -f $(RT28xx_DIR)/ap/.*.cmd
  409. +   rm -f $(RT28xx_DIR)/ap/.*.flags
  410. +   rm -f $(RT28xx_DIR)/ap/.*.d
  411.     rm -f $(RT28xx_DIR)/sta/*.o
  412. -   rm -f $(RT28xx_DIR)/sta/.*.{cmd,flags,d}
  413. +   rm -f $(RT28xx_DIR)/sta/.*.cmd
  414. +   rm -f $(RT28xx_DIR)/sta/.*.flags
  415. +   rm -f $(RT28xx_DIR)/sta/.*.d
  416.  endif
  417.  endif
  418.  endif
  419. diff -rub DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/os/linux/Makefile.6 DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/os/linux/Makefile.6
  420. --- DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/os/linux/Makefile.6 2010-12-17 12:44:47.000000000 +0100
  421. +++ DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/os/linux/Makefile.6 2012-12-06 07:47:05.000000000 +0100
  422. @@ -226,9 +226,17 @@
  423.  
  424.  clean:
  425.     rm -f ../../common/*.o
  426. -   rm -f ../../common/.*.{o,cmd,flags,d}
  427. -   rm -f ../../os/linux/*.{o,ko,mod.{o,c}}
  428. -   rm -f ../../os/linux/.*.{cmd,flags,d}
  429. +   rm -f ../../common/.*.o
  430. +   rm -f ../../common/.*.cmd
  431. +   rm -f ../../common/.*.flags
  432. +   rm -f ../../common/.*.d
  433. +   rm -f ../../os/linux/*.o
  434. +   rm -f ../../os/linux/*.ko
  435. +   rm -f ../../os/linux/*.mod.o
  436. +   rm -f ../../os/linux/*.mod.c
  437. +   rm -f ../../os/linux/.*.cmd
  438. +   rm -f ../../os/linux/.*.flags
  439. +   rm -f ../../os/linux/.*.d
  440.     rm -fr ../../os/linux/.tmp_versions
  441.  #Must clean Module.symvers; or you will suffer symbol version not match
  442.  #when OS_ABL = YES.
  443. @@ -236,20 +244,30 @@
  444.     rm -f ../../os/linux/Module.markers
  445.     rm -f ../../os/linux/modules.order
  446.     rm -f ../../chips/*.o
  447. -   rm -f ../../chips/.*.{cmd,flags,d}
  448. +   rm -f ../../chips/.*.cmd
  449. +   rm -f ../../chips/.*.flags
  450. +   rm -f ../../chips/.*.d
  451.  ifeq ($(RT28xx_MODE),AP)
  452.     rm -f ../../ap/*.o
  453. -   rm -f ../../ap/.*.{cmd,flags,d}
  454. +   rm -f ../../ap/.*.cmd
  455. +   rm -f ../../ap/.*.flags
  456. +   rm -f ../../ap/.*.d
  457.  else
  458.  ifeq ($(RT28xx_MODE),STA)
  459.     rm -f ../../sta/*.o
  460. -   rm -f ../../sta/.*.{cmd,flags,d}
  461. +   rm -f ../../sta/.*.cmd
  462. +   rm -f ../../sta/.*.flags
  463. +   rm -f ../../sta/.*.d
  464.  else
  465.  ifeq ($(RT28xx_MODE),APSTA)
  466.     rm -f ../../ap/*.o
  467. -   rm -f ../../ap/.*.{cmd,flags,d}
  468. +   rm -f ../../ap/.*.cmd
  469. +   rm -f ../../ap/.*.flags
  470. +   rm -f ../../ap/.*.d
  471.     rm -f ../../sta/*.o
  472. -   rm -f ../../sta/.*.{cmd,flags,d}
  473. +   rm -f ../../sta/.*.cmd
  474. +   rm -f ../../sta/.*.flags
  475. +   rm -f ../../sta/.*.d
  476.  endif
  477.  endif
  478.  endif
  479. diff -rub DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/os/linux/Makefile.6.netif DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/os/linux/Makefile.6.netif
  480. --- DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/os/linux/Makefile.6.netif   2010-12-17 12:44:47.000000000 +0100
  481. +++ DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/os/linux/Makefile.6.netif   2012-12-06 07:48:22.000000000 +0100
  482. @@ -326,22 +326,35 @@
  483.  
  484.  clean:
  485.     rm -f ../../common/*.o
  486. -   rm -f ../../common/.*.{cmd,flags,d}
  487. -   rm -f ../../os/linux/*.{o,ko,mod.{o,c}}
  488. -   rm -f ../../os/linux/.*.{cmd,flags,d}
  489. +   rm -f ../../common/.*.cmd
  490. +   rm -f ../../common/.*.flags
  491. +   rm -f ../../common/.*.d
  492. +   rm -f ../../os/linux/*.o
  493. +   rm -f ../../os/linux/*.ko
  494. +   rm -f ../../os/linux/*.mod.o
  495. +   rm -f ../../os/linux/*.mod.c
  496. +   rm -f ../../os/linux/.*.cmd
  497. +   rm -f ../../os/linux/.*.flags
  498. +   rm -f ../../os/linux/.*.d
  499.     rm -fr ../../os/linux/.tmp_versions
  500.     rm -f ../../os/linux/Module.symvers
  501.     rm -f ../../os/linux/Module.markers
  502.     rm -f ../../os/linux/modules.order
  503.     rm -f ../../chips/*.o
  504. -   rm -f ../../chips/.*.{cmd,flags,d}
  505. +   rm -f ../../chips/.*.cmd
  506. +   rm -f ../../chips/.*.flags
  507. +   rm -f ../../chips/.*.d
  508.  ifeq ($(RT28xx_MODE),AP)
  509.     rm -f ../../ap/*.o
  510. -   rm -f ../../ap/.*.{cmd,flags,d}
  511. +   rm -f ../../ap/.*.cmd
  512. +   rm -f ../../ap/.*.flags
  513. +   rm -f ../../ap/.*.d
  514.  else
  515.  ifeq ($(RT28xx_MODE),STA)
  516.     rm -f ../../sta/*.o
  517. -   rm -f ../../sta/.*.{cmd,flags,d}
  518. +   rm -f ../../sta/.*.cmd
  519. +   rm -f ../../sta/.*.flags
  520. +   rm -f ../../sta/.*.d
  521.  endif
  522.  endif
  523.  
  524. diff -rub DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/os/linux/Makefile.6.util DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/os/linux/Makefile.6.util
  525. --- DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/os/linux/Makefile.6.util    2010-12-17 12:44:47.000000000 +0100
  526. +++ DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/os/linux/Makefile.6.util    2012-12-06 07:49:29.000000000 +0100
  527. @@ -228,22 +228,35 @@
  528.  
  529.  clean:
  530.     rm -f ../../common/*.o
  531. -   rm -f ../../common/.*.{cmd,flags,d}
  532. -   rm -f ../../os/linux/*.{o,ko,mod.{o,c}}
  533. -   rm -f ../../os/linux/.*.{cmd,flags,d}
  534. +   rm -f ../../common/.*.cmd
  535. +   rm -f ../../common/.*.flags
  536. +   rm -f ../../common/.*.d
  537. +   rm -f ../../os/linux/*.o
  538. +   rm -f ../../os/linux/*.ko
  539. +   rm -f ../../os/linux/*.mod.o
  540. +   rm -f ../../os/linux/*.mod.c
  541. +   rm -f ../../os/linux/.*.cmd
  542. +   rm -f ../../os/linux/.*.flags
  543. +   rm -f ../../os/linux/.*.d
  544.     rm -fr ../../os/linux/.tmp_versions
  545.     rm -f ../../os/linux/Module.symvers
  546.     rm -f ../../os/linux/Module.markers
  547.     rm -f ../../os/linux/modules.order
  548.     rm -f ../../chips/*.o
  549. -   rm -f ../../chips/.*.{cmd,flags,d}
  550. +   rm -f ../../chips/.*.cmd
  551. +   rm -f ../../chips/.*.flags
  552. +   rm -f ../../chips/.*.d
  553.  ifeq ($(RT28xx_MODE),AP)
  554.     rm -f ../../ap/*.o
  555. -   rm -f ../../ap/.*.{cmd,flags,d}
  556. +   rm -f ../../ap/.*.cmd
  557. +   rm -f ../../ap/.*.flags
  558. +   rm -f ../../ap/.*.d
  559.  else
  560.  ifeq ($(RT28xx_MODE),STA)
  561.     rm -f ../../sta/*.o
  562. -   rm -f ../../sta/.*.{cmd,flags,d}
  563. +   rm -f ../../sta/.*.cmd
  564. +   rm -f ../../sta/.*.flags
  565. +   rm -f ../../sta/.*.d
  566.  endif
  567.  endif
  568.  
  569. diff -rub DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/os/linux/pci_main_dev.c DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/os/linux/pci_main_dev.c
  570. --- DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/os/linux/pci_main_dev.c 2010-12-17 12:44:47.000000000 +0100
  571. +++ DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/os/linux/pci_main_dev.c 2012-12-06 10:21:23.000000000 +0100
  572. @@ -301,7 +301,7 @@
  573.     PRTMP_ADAPTER       pAd = (PRTMP_ADAPTER)NULL;
  574.     struct  net_device      *net_dev;
  575.     PVOID               handle;
  576. -   PSTRING             print_name;
  577. +   const char*         print_name;
  578.     ULONG               csr_addr;
  579.     INT rv = 0;
  580.     RTMP_OS_NETDEV_OP_HOOK  netDevHook;
  581. diff -rub DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/os/linux/rt_linux.c DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/os/linux/rt_linux.c
  582. --- DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/os/linux/rt_linux.c 2010-12-17 12:44:47.000000000 +0100
  583. +++ DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/os/linux/rt_linux.c 2013-01-09 11:23:40.078069009 +0100
  584. @@ -479,9 +479,9 @@
  585.         MEM_DBG_PKT_ALLOC_INC(pAd);
  586.  
  587.         skb_reserve(skb, 2);               
  588. -       NdisMoveMemory(skb->tail, pHeader802_3, HdrLen);
  589. +       NdisMoveMemory(GET_OS_PKT_DATATAIL(skb), pHeader802_3, HdrLen);
  590.         skb_put(skb, HdrLen);
  591. -       NdisMoveMemory(skb->tail, pData, DataSize);
  592. +       NdisMoveMemory(GET_OS_PKT_DATATAIL(skb), pData, DataSize);
  593.         skb_put(skb, DataSize);
  594.         skb->dev = get_netdev_from_bssid(pAd, FromWhichBSSID);
  595.         pPacket = OSPKT_TO_RTPKT(skb);
  596. @@ -628,10 +628,10 @@
  597.     {
  598.         // set the correct dataptr and data len
  599.         MEM_DBG_PKT_ALLOC_INC(pAd);
  600. -       pClonedPkt->dev = pRxPkt->dev;
  601. -       pClonedPkt->data = pData;
  602. -       pClonedPkt->len = DataSize;
  603. -       pClonedPkt->tail = pClonedPkt->data + pClonedPkt->len;
  604. +       SET_OS_PKT_NETDEV(pClonedPkt, pRxPkt->dev);
  605. +       SET_OS_PKT_DATAPTR(pClonedPkt, pData);
  606. +       SET_OS_PKT_LEN(pClonedPkt, DataSize);
  607. +       SET_OS_PKT_DATATAIL(pClonedPkt, pData, DataSize);
  608.         ASSERT(DataSize < 1530);
  609.     }
  610.     return pClonedPkt;
  611. @@ -650,10 +650,10 @@
  612.     ASSERT(pRxBlk->pRxPacket);
  613.     pOSPkt = RTPKT_TO_OSPKT(pRxBlk->pRxPacket);
  614.  
  615. -   pOSPkt->dev = get_netdev_from_bssid(pAd, FromWhichBSSID);
  616. -   pOSPkt->data = pRxBlk->pData;
  617. -   pOSPkt->len = pRxBlk->DataSize;
  618. -   pOSPkt->tail = pOSPkt->data + pOSPkt->len;
  619. +   SET_OS_PKT_NETDEV(pOSPkt, get_netdev_from_bssid(pAd, FromWhichBSSID));
  620. +   SET_OS_PKT_DATAPTR(pOSPkt, pRxBlk->pData);
  621. +   SET_OS_PKT_LEN(pOSPkt, pRxBlk->DataSize);
  622. +   SET_OS_PKT_DATATAIL(pOSPkt, pRxBlk->pData, pRxBlk->DataSize);
  623.  }
  624.  
  625.  
  626. @@ -671,10 +671,10 @@
  627.  
  628.     pOSPkt = RTPKT_TO_OSPKT(pRxBlk->pRxPacket);
  629.  
  630. -   pOSPkt->dev = get_netdev_from_bssid(pAd, FromWhichBSSID);
  631. -   pOSPkt->data = pRxBlk->pData;
  632. -   pOSPkt->len = pRxBlk->DataSize;
  633. -   pOSPkt->tail = pOSPkt->data + pOSPkt->len;
  634. +   SET_OS_PKT_NETDEV(pOSPkt, get_netdev_from_bssid(pAd, FromWhichBSSID));
  635. +   SET_OS_PKT_DATAPTR(pOSPkt, pRxBlk->pData);
  636. +   SET_OS_PKT_LEN(pOSPkt, pRxBlk->DataSize);
  637. +   SET_OS_PKT_DATATAIL(pOSPkt, pRxBlk->pData, pRxBlk->DataSize);
  638.  
  639.     //
  640.     // copy 802.3 header
  641. @@ -996,9 +996,9 @@
  642.          skb_put(pOSPkt,(pRxBlk->DataSize - pOSPkt->len));
  643.      } //end if
  644.  
  645. -    if ((pRxBlk->pData - pOSPkt->data) > 0) {
  646. -       skb_put(pOSPkt,(pRxBlk->pData - pOSPkt->data));
  647. -       skb_pull(pOSPkt,(pRxBlk->pData - pOSPkt->data));
  648. +    if ((pRxBlk->pData - GET_OS_PKT_DATAPTR(pOSPkt)) > 0) {
  649. +       skb_put(pOSPkt, (pRxBlk->pData - GET_OS_PKT_DATAPTR(pOSPkt)));
  650. +       skb_pull(pOSPkt, (pRxBlk->pData - GET_OS_PKT_DATAPTR(pOSPkt)));
  651.      } //end if
  652.  
  653.      if (skb_headroom(pOSPkt) < (sizeof(wlan_ng_prism2_header)+ header_len)) {
  654. @@ -1696,13 +1696,17 @@
  655.  void RtmpOSNetDevDetach(PNET_DEV pNetDev)
  656.  {
  657.  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
  658. -   struct net_device_ops *pNetDevOps = pNetDev->netdev_ops;
  659. +   union {
  660. +       const struct net_device_ops *const_ops;
  661. +       struct net_device_ops *ops;
  662. +   } pNetDevOps;
  663. +   pNetDevOps.const_ops = pNetDev->netdev_ops;;
  664.  #endif
  665.  
  666.     unregister_netdev(pNetDev);
  667.  
  668.  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
  669. -   vfree(pNetDevOps);
  670. +   vfree(pNetDevOps.ops);
  671.  #endif
  672.  }
  673.  
  674. @@ -1733,7 +1737,11 @@
  675.     int ret, rtnl_locked = FALSE;
  676.  
  677.  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
  678. -   struct net_device_ops *pNetDevOps = pNetDev->netdev_ops;
  679. +   union {
  680. +       const struct net_device_ops *const_ops;
  681. +       struct net_device_ops *ops;
  682. +   } pNetDevOps;
  683. +   pNetDevOps.const_ops = pNetDev->netdev_ops;;
  684.  #endif
  685.  
  686.     DBGPRINT(RT_DEBUG_TRACE, ("RtmpOSNetDevAttach()--->\n"));
  687. @@ -1746,10 +1754,10 @@
  688.         GET_PAD_FROM_NET_DEV(pAd, pNetDev);
  689.        
  690.  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
  691. -       pNetDevOps->ndo_open            = pDevOpHook->open;
  692. -       pNetDevOps->ndo_stop            = pDevOpHook->stop;
  693. -       pNetDevOps->ndo_start_xmit  = (HARD_START_XMIT_FUNC)(pDevOpHook->xmit);
  694. -       pNetDevOps->ndo_do_ioctl        = pDevOpHook->ioctl;
  695. +       pNetDevOps.ops->ndo_open            = pDevOpHook->open;
  696. +       pNetDevOps.ops->ndo_stop            = pDevOpHook->stop;
  697. +       pNetDevOps.ops->ndo_start_xmit  = (HARD_START_XMIT_FUNC)(pDevOpHook->xmit);
  698. +       pNetDevOps.ops->ndo_do_ioctl        = pDevOpHook->ioctl;
  699.  #else
  700.         pNetDev->open           = pDevOpHook->open;
  701.         pNetDev->stop           = pDevOpHook->stop;
  702. @@ -1766,7 +1774,7 @@
  703.         */
  704.         if (pDevOpHook->get_stats)
  705.  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
  706. -           pNetDevOps->ndo_get_stats = pDevOpHook->get_stats;
  707. +           pNetDevOps.ops->ndo_get_stats = pDevOpHook->get_stats;
  708.  #else
  709.             pNetDev->get_stats = pDevOpHook->get_stats;
  710.  #endif
  711. @@ -1817,7 +1825,7 @@
  712.  
  713.  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
  714.  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
  715. -   pNetDevOps->ndo_validate_addr = NULL;
  716. +   pNetDevOps.ops->ndo_validate_addr = NULL;
  717.     //pNetDev->netdev_ops = ops;
  718.  #else
  719.     pNetDev->validate_addr = NULL;
  720. diff -rub DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/os/linux/rt_main_dev.c DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/os/linux/rt_main_dev.c
  721. --- DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/os/linux/rt_main_dev.c  2010-12-17 12:44:47.000000000 +0100
  722. +++ DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/os/linux/rt_main_dev.c  2013-01-10 17:45:38.237701419 +0100
  723. @@ -1247,7 +1247,7 @@
  724.     RTMP_OS_TASK *pTask;
  725.  
  726.     if (pAd->bWriteDat == FALSE)
  727. -       return;
  728. +       return status;
  729.  
  730.     DBGPRINT(RT_DEBUG_TRACE, ("-->WriteDatThreadInit()\n"));
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement