Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- 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
- --- DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/common/cmm_asic.c 2010-12-17 12:44:47.000000000 +0100
- +++ DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/common/cmm_asic.c 2012-12-06 09:51:34.000000000 +0100
- @@ -3244,7 +3244,7 @@
- PUCHAR ptr;
- UINT i;
- ULONG beaconBaseLocation = 0;
- - USHORT beaconLen = pAd->BeaconTxWI.MPDUtotalByteCount;
- + USHORT beaconLen;
- #ifdef SPECIFIC_BCN_BUF_SUPPORT
- unsigned long irqFlag;
- #endif // SPECIFIC_BCN_BUF_SUPPORT //
- @@ -3255,7 +3255,10 @@
- NdisMoveMemory((PUCHAR)&localTxWI, (PUCHAR)&pAd->BeaconTxWI, TXWI_SIZE);
- RTMPWIEndianChange((PUCHAR)&localTxWI, TYPE_TXWI);
- beaconLen = localTxWI.MPDUtotalByteCount;
- +#else
- + beaconLen = pAd->BeaconTxWI.MPDUtotalByteCount;
- #endif // RT_BIG_ENDIAN //
- + (void)beaconLen; /* avoid compiler warning -Wunused-variable */
- DBGPRINT(RT_DEBUG_TRACE, ("--->AsicEnableIbssSync(MPDUtotalByteCount=%d, beaconLen=%d)\n", pAd->BeaconTxWI.MPDUtotalByteCount, beaconLen));
- @@ -3985,6 +3988,7 @@
- RTMP_MAC_SHR_MSEL_LOCK(pAd, LOWER_SHRMEM, irqFlag);
- #endif // SPECIFIC_BCN_BUF_SUPPORT //
- + (void)CipherAlg; /* avoid compiler warning -Wunused-variable */
- // EKEY
- offset = PAIRWISE_KEY_TABLE_BASE + (WCID * HW_KEY_ENTRY_SIZE);
- #ifdef RTMP_MAC_PCI
- 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
- --- DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/common/cmm_wpa.c 2010-12-17 12:44:47.000000000 +0100
- +++ DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/common/cmm_wpa.c 2013-01-10 17:44:19.229223296 +0100
- @@ -1108,6 +1108,8 @@
- BOOLEAN Cancelled;
- UCHAR group_cipher = Ndis802_11WEPDisabled;
- + (void)group_cipher; /* avoid compiler warning -Wunused-variable */
- +
- DBGPRINT(RT_DEBUG_TRACE, ("===> PeerPairMsg4Action\n"));
- do
- @@ -1454,6 +1456,8 @@
- PEAPOL_PACKET pMsg2;
- UCHAR group_cipher = Ndis802_11WEPDisabled;
- + (void)group_cipher; /* avoid compiler warning -Wunused-variable */
- +
- DBGPRINT(RT_DEBUG_TRACE, ("===> PeerGroupMsg2Action \n"));
- if ((!pEntry) || !IS_ENTRY_CLIENT(pEntry))
- @@ -2410,7 +2414,7 @@
- UCHAR PrimaryRsnie;
- BOOLEAN bMixCipher = FALSE; // indicate the pairwise and group cipher are different
- UCHAR p_offset;
- - WPA_MIX_PAIR_CIPHER FlexibleCipher = MIX_CIPHER_NOTUSE; // it provide the more flexible cipher combination in WPA-WPA2 and TKIPAES mode
- + WPA_MIX_PAIR_CIPHER FlexibleCipher = WPA_TKIPAES_WPA2_TKIPAES; // it provide the more flexible cipher combination in WPA-WPA2 and TKIPAES mode
- rsnielen_cur_p = NULL;
- rsnielen_ex_cur_p = NULL;
- 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
- --- DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/common/crypt_md5.c 2010-12-17 12:44:47.000000000 +0100
- +++ DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/common/crypt_md5.c 2012-12-06 10:10:47.000000000 +0100
- @@ -319,7 +319,7 @@
- NdisMoveMemory((UCHAR *)Digest, (ULONG *)pCtx->Buf, 16); // output
- byteReverse((UCHAR *)Digest, 4);
- - NdisZeroMemory(pCtx, sizeof(pCtx)); // memory free
- + NdisZeroMemory(pCtx, sizeof(*pCtx)); // memory free
- }
- @@ -618,7 +618,7 @@
- Digest [i] = (UCHAR)(pCtx->Buf[i>>2] >> 8*(3-(i & 0x3)));
- }
- - NdisZeroMemory(pCtx, sizeof(pCtx)); // memory free
- + NdisZeroMemory(pCtx, sizeof(*pCtx)); // memory free
- }
- 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
- --- DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/common/mlme.c 2010-12-17 12:44:47.000000000 +0100
- +++ DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/common/mlme.c 2012-12-06 10:12:07.000000000 +0100
- @@ -865,8 +865,8 @@
- /* for performace enchanement */
- NdisZeroMemory(&pAd->RalinkCounters,
- - (UINT32)&pAd->RalinkCounters.OneSecEnd -
- - (UINT32)&pAd->RalinkCounters.OneSecStart);
- + (UINT32)(&pAd->RalinkCounters.OneSecEnd -
- + &pAd->RalinkCounters.OneSecStart));
- return;
- }
- @@ -5654,7 +5654,7 @@
- BssEntrySet(pAd, &Tab->BssEntry[Idx], pBssid, Ssid, SsidLen, BssType, BeaconPeriod, CfParm, AtimWin,
- CapabilityInfo, SupRate, SupRateLen, ExtRate, ExtRateLen,pHtCapability, pAddHtInfo,HtCapabilityLen, AddHtInfoLen,
- NewExtChanOffset, ChannelNo, Rssi, TimeStamp, CkipFlag, pEdcaParm, pQosCapability, pQbssLoad, LengthVIE, pVIE);
- - Tab->BssOverlapNr = (Tab->BssOverlapNr++) % MAX_LEN_OF_BSS_TABLE;
- + Tab->BssOverlapNr = (Tab->BssOverlapNr + 1) % MAX_LEN_OF_BSS_TABLE;
- }
- return Idx;
- }
- 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
- --- DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/common/rtmp_init.c 2010-12-17 12:44:47.000000000 +0100
- +++ DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/common/rtmp_init.c 2012-12-06 09:46:01.000000000 +0100
- @@ -1388,7 +1388,7 @@
- UINT32 FormalVersion;
- FormalVersion = ((pAd->EepromVersion & 0x0f) << 8) + (pAd->EepromVersion >> 8);
- - printk("FormalVersion=0x%x, pAd->EepromVersion=0x%x!\n", FormalVersion, pAd->EepromVersion);
- + printk("FormalVersion=0x%x, pAd->EepromVersion=0x%lx!\n", FormalVersion, pAd->EepromVersion);
- if (FormalVersion >= 0x0201)
- {
- WM_COEX_SET_FLAG(pAd, fWM_GPIO4_ACTIVE_HIGH);
- 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
- --- DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/include/firmware.h 2010-12-17 12:44:47.000000000 +0100
- +++ DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/include/firmware.h 2013-01-10 17:45:39.992823465 +0100
- @@ -1,45 +1,5 @@
- -/*
- - *************************************************************************
- -Copyright (c) 2010, Ralink Technology Corporation
- -All rights reserved.
- -
- -Redistribution. Redistribution and use in binary form, without
- -modification, are permitted provided that the following conditions are
- -met:
- -
- -* Redistributions must reproduce the above copyright notice and the
- - following disclaimer in the documentation and/or other materials
- - provided with the distribution.
- -* Neither the name of Ralink Technology Corporation nor the names of its
- - suppliers may be used to endorse or promote products derived from this
- - software without specific prior written permission.
- -* No reverse engineering, decompilation, or disassembly of this software
- - is permitted.
- -
- -Limited patent license. Ralink Technology Corporation grants a world-wide,
- -royalty-free, non-exclusive license under patents it now or hereafter
- -owns or controls to make, have made, use, import, offer to sell and
- -sell ("Utilize") this software, but solely to the extent that any
- -such patent is necessary to Utilize the software alone, or in
- -combination with an operating system licensed under an approved Open
- -Source license as listed by the Open Source Initiative at
- -http://opensource.org/licenses. The patent license shall not apply to
- -any other combinations which include this software. No hardware per
- -se is licensed hereunder.
- -
- -DISCLAIMER. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- -CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
- -BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- -FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- -COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- -BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- -OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- -TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
- -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- -DAMAGE.
- - *************************************************************************/
- +/* AUTO GEN PLEASE DO NOT MODIFY IT */
- +/* AUTO GEN PLEASE DO NOT MODIFY IT */
- UCHAR FirmwareImage [] = {
- 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
- --- DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/include/os/rt_linux.h 2010-12-17 12:44:47.000000000 +0100
- +++ DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/include/os/rt_linux.h 2013-01-09 11:24:41.134069403 +0100
- @@ -943,15 +943,16 @@
- (RTPKT_TO_OSPKT(_pkt)->len) = (_len)
- #define GET_OS_PKT_DATATAIL(_pkt) \
- - (RTPKT_TO_OSPKT(_pkt)->tail)
- + (skb_tail_pointer(RTPKT_TO_OSPKT(_pkt)))
- #define SET_OS_PKT_DATATAIL(_pkt, _start, _len) \
- - ((RTPKT_TO_OSPKT(_pkt))->tail) = (PUCHAR)((_start) + (_len))
- + (SET_OS_PKT_DATAPTR(_pkt, _start), \
- + skb_set_tail_pointer(RTPKT_TO_OSPKT(_pkt), (_len)))
- #define GET_OS_PKT_HEAD(_pkt) \
- (RTPKT_TO_OSPKT(_pkt)->head)
- #define GET_OS_PKT_END(_pkt) \
- - (RTPKT_TO_OSPKT(_pkt)->end)
- + (skb_end_pointer(RTPKT_TO_OSPKT(_pkt)))
- #define GET_OS_PKT_NETDEV(_pkt) \
- (RTPKT_TO_OSPKT(_pkt)->dev)
- Nur in DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched: log.
- 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
- --- DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/Makefile 2010-12-17 12:44:47.000000000 +0100
- +++ DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/Makefile 2012-12-06 07:38:17.000000000 +0100
- @@ -1,3 +1,4 @@
- +UNAME_R = $(shell uname -r)
- RT28xx_MODE = STA
- TARGET = LINUX
- @@ -139,10 +140,10 @@
- ifeq ($(PLATFORM),PC)
- # Linux 2.6
- -LINUX_SRC = /lib/modules/$(shell uname -r)/build
- +LINUX_SRC = /lib/modules/$(UNAME_R)/build
- # Linux 2.4 Change to your local setting
- #LINUX_SRC = /usr/src/linux-2.4
- -LINUX_SRC_MODULE = /lib/modules/$(shell uname -r)/kernel/drivers/net/wireless/
- +LINUX_SRC_MODULE = /lib/modules/$(UNAME_R)/kernel/drivers/net/wireless/
- CROSS_COMPILE =
- endif
- @@ -153,7 +154,7 @@
- ifeq ($(PLATFORM),INF_TWINPASS)
- # Linux 2.6
- -#LINUX_SRC = /lib/modules/$(shell uname -r)/build
- +#LINUX_SRC = /lib/modules/$(UNAME_R)/build
- # Linux 2.4 Change to your local setting
- LINUX_SRC = /project/stable/twinpass/release/2.0.1/source/kernel/opensource/linux-2.4.31/
- CROSS_COMPILE = mips-linux-
- @@ -183,7 +184,7 @@
- ifeq ($(PLATFORM),INF_AMAZON_SE)
- # Linux 2.6
- -#LINUX_SRC = /lib/modules/$(shell uname -r)/build
- +#LINUX_SRC = /lib/modules/$(UNAME_R)/build
- # Linux 2.4 Change to your local setting
- LINUX_SRC = /backup/ifx/3.6.2.2/source/kernel/opensource/linux-2.4.31
- #CROSS_COMPILE = mips-linux-
- 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
- --- DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/os/linux/config.mk 2010-12-17 12:44:47.000000000 +0100
- +++ DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/os/linux/config.mk 2012-12-06 07:37:29.000000000 +0100
- @@ -9,10 +9,10 @@
- # Support Wpa_Supplicant
- -HAS_WPA_SUPPLICANT=n
- +HAS_WPA_SUPPLICANT=y
- # Support Native WpaSupplicant for Network Maganger
- -HAS_NATIVE_WPA_SUPPLICANT_SUPPORT=n
- +HAS_NATIVE_WPA_SUPPLICANT_SUPPORT=y
- #Support Net interface block while Tx-Sw queue full
- HAS_BLOCK_NET_IF=n
- @@ -109,7 +109,7 @@
- # config for STA mode
- ifeq ($(RT28xx_MODE),STA)
- -WFLAGS += -DCONFIG_STA_SUPPORT -DDBG
- +WFLAGS += -DCONFIG_STA_SUPPORT
- ifeq ($(HAS_XLINK),y)
- WFLAGS += -DXLINK_SUPPORT
- 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
- --- DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/os/linux/Makefile.4 2010-12-17 12:44:47.000000000 +0100
- +++ DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/os/linux/Makefile.4 2012-12-06 07:42:35.000000000 +0100
- @@ -247,25 +247,42 @@
- clean:
- rm -f $(RT28xx_DIR)/common/*.o
- - rm -f $(RT28xx_DIR)/common/.*.{cmd,flags,d}
- - rm -f $(RT28xx_DIR)/os/linux/*.{o,ko,mod.{o,c}}
- - rm -f $(RT28xx_DIR)/os/linux/.*.{cmd,flags,d}
- + rm -f $(RT28xx_DIR)/common/.*.cmd
- + rm -f $(RT28xx_DIR)/common/.*.flags
- + rm -f $(RT28xx_DIR)/common/.*.d
- + rm -f $(RT28xx_DIR)/os/linux/*.o,
- + rm -f $(RT28xx_DIR)/os/linux/*.ko
- + rm -f $(RT28xx_DIR)/os/linux/*.mod.o
- + rm -f $(RT28xx_DIR)/os/linux/*.mod.c
- + rm -f $(RT28xx_DIR)/os/linux/.*.cmd
- + rm -f $(RT28xx_DIR)/os/linux/.*.flags
- + rm -f $(RT28xx_DIR)/os/linux/.*.d
- rm -fr $(RT28xx_DIR)/os/linux/.tmp_versions
- rm -f $(RT28xx_DIR)/chips/*.o
- - rm -f $(RT28xx_DIR)/chips/.*.{cmd,flags,d}
- + rm -f $(RT28xx_DIR)/chips/.*.cmd
- + rm -f $(RT28xx_DIR)/chips/.*.flags
- + rm -f $(RT28xx_DIR)/chips/.*.d
- ifeq ($(RT28xx_MODE),AP)
- rm -f $(RT28xx_DIR)/ap/*.o
- - rm -f $(RT28xx_DIR)/ap/.*.{cmd,flags,d}
- + rm -f $(RT28xx_DIR)/ap/.*.cmd
- + rm -f $(RT28xx_DIR)/ap/.*.flags
- + rm -f $(RT28xx_DIR)/ap/.*.d
- else
- ifeq ($(RT28xx_MODE),STA)
- rm -f $(RT28xx_DIR)/sta/*.o
- - rm -f $(RT28xx_DIR)/sta/.*.{cmd,flags,d}
- + rm -f $(RT28xx_DIR)/sta/.*.cmd
- + rm -f $(RT28xx_DIR)/sta/.*.flags
- + rm -f $(RT28xx_DIR)/sta/.*.d
- else
- ifeq ($(RT28xx_MODE),APSTA)
- rm -f $(RT28xx_DIR)/ap/*.o
- - rm -f $(RT28xx_DIR)/ap/.*.{cmd,flags,d}
- + rm -f $(RT28xx_DIR)/ap/.*.cmd
- + rm -f $(RT28xx_DIR)/ap/.*.flags
- + rm -f $(RT28xx_DIR)/ap/.*.d
- rm -f $(RT28xx_DIR)/sta/*.o
- - rm -f $(RT28xx_DIR)/sta/.*.{cmd,flags,d}
- + rm -f $(RT28xx_DIR)/sta/.*.cmd
- + rm -f $(RT28xx_DIR)/sta/.*.flags
- + rm -f $(RT28xx_DIR)/sta/.*.d
- endif
- endif
- endif
- 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
- --- DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/os/linux/Makefile.4.netif 2010-12-17 12:44:47.000000000 +0100
- +++ DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/os/linux/Makefile.4.netif 2012-12-06 07:44:10.000000000 +0100
- @@ -322,25 +322,42 @@
- clean:
- rm -f $(RT28xx_DIR)/common/*.o
- - rm -f $(RT28xx_DIR)/common/.*.{cmd,flags,d}
- - rm -f $(RT28xx_DIR)/os/linux/*.{o,ko,mod.{o,c}}
- - rm -f $(RT28xx_DIR)/os/linux/.*.{cmd,flags,d}
- + rm -f $(RT28xx_DIR)/common/.*.cmd
- + rm -f $(RT28xx_DIR)/common/.*.flags
- + rm -f $(RT28xx_DIR)/common/.*.d
- + rm -f $(RT28xx_DIR)/os/linux/*.o
- + rm -f $(RT28xx_DIR)/os/linux/*.ko
- + rm -f $(RT28xx_DIR)/os/linux/*.mod.o
- + rm -f $(RT28xx_DIR)/os/linux/*.mod.c
- + rm -f $(RT28xx_DIR)/os/linux/.*.cmd
- + rm -f $(RT28xx_DIR)/os/linux/.*.flags
- + rm -f $(RT28xx_DIR)/os/linux/.*.d
- rm -fr $(RT28xx_DIR)/os/linux/.tmp_versions
- rm -f $(RT28xx_DIR)/chips/*.o
- - rm -f $(RT28xx_DIR)/chips/.*.{cmd,flags,d}
- + rm -f $(RT28xx_DIR)/chips/.*.cmd
- + rm -f $(RT28xx_DIR)/chips/.*.flags
- + rm -f $(RT28xx_DIR)/chips/.*.d
- ifeq ($(RT28xx_MODE),AP)
- rm -f $(RT28xx_DIR)/ap/*.o
- - rm -f $(RT28xx_DIR)/ap/.*.{cmd,flags,d}
- + rm -f $(RT28xx_DIR)/ap/.*.cmd
- + rm -f $(RT28xx_DIR)/ap/.*.flags
- + rm -f $(RT28xx_DIR)/ap/.*.d
- else
- ifeq ($(RT28xx_MODE),STA)
- rm -f $(RT28xx_DIR)/sta/*.o
- - rm -f $(RT28xx_DIR)/sta/.*.{cmd,flags,d}
- + rm -f $(RT28xx_DIR)/sta/.*.cmd
- + rm -f $(RT28xx_DIR)/sta/.*.flags
- + rm -f $(RT28xx_DIR)/sta/.*.d
- else
- ifeq ($(RT28xx_MODE),APSTA)
- rm -f $(RT28xx_DIR)/ap/*.o
- - rm -f $(RT28xx_DIR)/ap/.*.{cmd,flags,d}
- + rm -f $(RT28xx_DIR)/ap/.*.cmd
- + rm -f $(RT28xx_DIR)/ap/.*.flags
- + rm -f $(RT28xx_DIR)/ap/.*.d
- rm -f $(RT28xx_DIR)/sta/*.o
- - rm -f $(RT28xx_DIR)/sta/.*.{cmd,flags,d}
- + rm -f $(RT28xx_DIR)/sta/.*.cmd
- + rm -f $(RT28xx_DIR)/sta/.*.flags
- + rm -f $(RT28xx_DIR)/sta/.*.d
- endif
- endif
- endif
- 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
- --- DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/os/linux/Makefile.4.util 2010-12-17 12:44:47.000000000 +0100
- +++ DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/os/linux/Makefile.4.util 2012-12-06 07:45:29.000000000 +0100
- @@ -236,25 +236,42 @@
- clean:
- rm -f $(RT28xx_DIR)/common/*.o
- - rm -f $(RT28xx_DIR)/common/.*.{cmd,flags,d}
- - rm -f $(RT28xx_DIR)/os/linux/*.{o,ko,mod.{o,c}}
- - rm -f $(RT28xx_DIR)/os/linux/.*.{cmd,flags,d}
- + rm -f $(RT28xx_DIR)/common/.*.cmd
- + rm -f $(RT28xx_DIR)/common/.*.flags
- + rm -f $(RT28xx_DIR)/common/.*.d
- + rm -f $(RT28xx_DIR)/os/linux/*.o
- + rm -f $(RT28xx_DIR)/os/linux/*.ko
- + rm -f $(RT28xx_DIR)/os/linux/*.mod.o
- + rm -f $(RT28xx_DIR)/os/linux/*.mod.c
- + rm -f $(RT28xx_DIR)/os/linux/.*.cmd
- + rm -f $(RT28xx_DIR)/os/linux/.*.flags
- + rm -f $(RT28xx_DIR)/os/linux/.*.d
- rm -fr $(RT28xx_DIR)/os/linux/.tmp_versions
- rm -f $(RT28xx_DIR)/chips/*.o
- - rm -f $(RT28xx_DIR)/chips/.*.{cmd,flags,d}
- + rm -f $(RT28xx_DIR)/chips/.*.cmd
- + rm -f $(RT28xx_DIR)/chips/.*.flags
- + rm -f $(RT28xx_DIR)/chips/.*.d
- ifeq ($(RT28xx_MODE),AP)
- rm -f $(RT28xx_DIR)/ap/*.o
- - rm -f $(RT28xx_DIR)/ap/.*.{cmd,flags,d}
- + rm -f $(RT28xx_DIR)/ap/.*.cmd
- + rm -f $(RT28xx_DIR)/ap/.*.flags
- + rm -f $(RT28xx_DIR)/ap/.*.d
- else
- ifeq ($(RT28xx_MODE),STA)
- rm -f $(RT28xx_DIR)/sta/*.o
- - rm -f $(RT28xx_DIR)/sta/.*.{cmd,flags,d}
- + rm -f $(RT28xx_DIR)/sta/.*.cmd
- + rm -f $(RT28xx_DIR)/sta/.*.flags
- + rm -f $(RT28xx_DIR)/sta/.*.d
- else
- ifeq ($(RT28xx_MODE),APSTA)
- rm -f $(RT28xx_DIR)/ap/*.o
- - rm -f $(RT28xx_DIR)/ap/.*.{cmd,flags,d}
- + rm -f $(RT28xx_DIR)/ap/.*.cmd
- + rm -f $(RT28xx_DIR)/ap/.*.flags
- + rm -f $(RT28xx_DIR)/ap/.*.d
- rm -f $(RT28xx_DIR)/sta/*.o
- - rm -f $(RT28xx_DIR)/sta/.*.{cmd,flags,d}
- + rm -f $(RT28xx_DIR)/sta/.*.cmd
- + rm -f $(RT28xx_DIR)/sta/.*.flags
- + rm -f $(RT28xx_DIR)/sta/.*.d
- endif
- endif
- endif
- 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
- --- DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/os/linux/Makefile.6 2010-12-17 12:44:47.000000000 +0100
- +++ DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/os/linux/Makefile.6 2012-12-06 07:47:05.000000000 +0100
- @@ -226,9 +226,17 @@
- clean:
- rm -f ../../common/*.o
- - rm -f ../../common/.*.{o,cmd,flags,d}
- - rm -f ../../os/linux/*.{o,ko,mod.{o,c}}
- - rm -f ../../os/linux/.*.{cmd,flags,d}
- + rm -f ../../common/.*.o
- + rm -f ../../common/.*.cmd
- + rm -f ../../common/.*.flags
- + rm -f ../../common/.*.d
- + rm -f ../../os/linux/*.o
- + rm -f ../../os/linux/*.ko
- + rm -f ../../os/linux/*.mod.o
- + rm -f ../../os/linux/*.mod.c
- + rm -f ../../os/linux/.*.cmd
- + rm -f ../../os/linux/.*.flags
- + rm -f ../../os/linux/.*.d
- rm -fr ../../os/linux/.tmp_versions
- #Must clean Module.symvers; or you will suffer symbol version not match
- #when OS_ABL = YES.
- @@ -236,20 +244,30 @@
- rm -f ../../os/linux/Module.markers
- rm -f ../../os/linux/modules.order
- rm -f ../../chips/*.o
- - rm -f ../../chips/.*.{cmd,flags,d}
- + rm -f ../../chips/.*.cmd
- + rm -f ../../chips/.*.flags
- + rm -f ../../chips/.*.d
- ifeq ($(RT28xx_MODE),AP)
- rm -f ../../ap/*.o
- - rm -f ../../ap/.*.{cmd,flags,d}
- + rm -f ../../ap/.*.cmd
- + rm -f ../../ap/.*.flags
- + rm -f ../../ap/.*.d
- else
- ifeq ($(RT28xx_MODE),STA)
- rm -f ../../sta/*.o
- - rm -f ../../sta/.*.{cmd,flags,d}
- + rm -f ../../sta/.*.cmd
- + rm -f ../../sta/.*.flags
- + rm -f ../../sta/.*.d
- else
- ifeq ($(RT28xx_MODE),APSTA)
- rm -f ../../ap/*.o
- - rm -f ../../ap/.*.{cmd,flags,d}
- + rm -f ../../ap/.*.cmd
- + rm -f ../../ap/.*.flags
- + rm -f ../../ap/.*.d
- rm -f ../../sta/*.o
- - rm -f ../../sta/.*.{cmd,flags,d}
- + rm -f ../../sta/.*.cmd
- + rm -f ../../sta/.*.flags
- + rm -f ../../sta/.*.d
- endif
- endif
- endif
- 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
- --- DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/os/linux/Makefile.6.netif 2010-12-17 12:44:47.000000000 +0100
- +++ DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/os/linux/Makefile.6.netif 2012-12-06 07:48:22.000000000 +0100
- @@ -326,22 +326,35 @@
- clean:
- rm -f ../../common/*.o
- - rm -f ../../common/.*.{cmd,flags,d}
- - rm -f ../../os/linux/*.{o,ko,mod.{o,c}}
- - rm -f ../../os/linux/.*.{cmd,flags,d}
- + rm -f ../../common/.*.cmd
- + rm -f ../../common/.*.flags
- + rm -f ../../common/.*.d
- + rm -f ../../os/linux/*.o
- + rm -f ../../os/linux/*.ko
- + rm -f ../../os/linux/*.mod.o
- + rm -f ../../os/linux/*.mod.c
- + rm -f ../../os/linux/.*.cmd
- + rm -f ../../os/linux/.*.flags
- + rm -f ../../os/linux/.*.d
- rm -fr ../../os/linux/.tmp_versions
- rm -f ../../os/linux/Module.symvers
- rm -f ../../os/linux/Module.markers
- rm -f ../../os/linux/modules.order
- rm -f ../../chips/*.o
- - rm -f ../../chips/.*.{cmd,flags,d}
- + rm -f ../../chips/.*.cmd
- + rm -f ../../chips/.*.flags
- + rm -f ../../chips/.*.d
- ifeq ($(RT28xx_MODE),AP)
- rm -f ../../ap/*.o
- - rm -f ../../ap/.*.{cmd,flags,d}
- + rm -f ../../ap/.*.cmd
- + rm -f ../../ap/.*.flags
- + rm -f ../../ap/.*.d
- else
- ifeq ($(RT28xx_MODE),STA)
- rm -f ../../sta/*.o
- - rm -f ../../sta/.*.{cmd,flags,d}
- + rm -f ../../sta/.*.cmd
- + rm -f ../../sta/.*.flags
- + rm -f ../../sta/.*.d
- endif
- endif
- 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
- --- DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/os/linux/Makefile.6.util 2010-12-17 12:44:47.000000000 +0100
- +++ DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/os/linux/Makefile.6.util 2012-12-06 07:49:29.000000000 +0100
- @@ -228,22 +228,35 @@
- clean:
- rm -f ../../common/*.o
- - rm -f ../../common/.*.{cmd,flags,d}
- - rm -f ../../os/linux/*.{o,ko,mod.{o,c}}
- - rm -f ../../os/linux/.*.{cmd,flags,d}
- + rm -f ../../common/.*.cmd
- + rm -f ../../common/.*.flags
- + rm -f ../../common/.*.d
- + rm -f ../../os/linux/*.o
- + rm -f ../../os/linux/*.ko
- + rm -f ../../os/linux/*.mod.o
- + rm -f ../../os/linux/*.mod.c
- + rm -f ../../os/linux/.*.cmd
- + rm -f ../../os/linux/.*.flags
- + rm -f ../../os/linux/.*.d
- rm -fr ../../os/linux/.tmp_versions
- rm -f ../../os/linux/Module.symvers
- rm -f ../../os/linux/Module.markers
- rm -f ../../os/linux/modules.order
- rm -f ../../chips/*.o
- - rm -f ../../chips/.*.{cmd,flags,d}
- + rm -f ../../chips/.*.cmd
- + rm -f ../../chips/.*.flags
- + rm -f ../../chips/.*.d
- ifeq ($(RT28xx_MODE),AP)
- rm -f ../../ap/*.o
- - rm -f ../../ap/.*.{cmd,flags,d}
- + rm -f ../../ap/.*.cmd
- + rm -f ../../ap/.*.flags
- + rm -f ../../ap/.*.d
- else
- ifeq ($(RT28xx_MODE),STA)
- rm -f ../../sta/*.o
- - rm -f ../../sta/.*.{cmd,flags,d}
- + rm -f ../../sta/.*.cmd
- + rm -f ../../sta/.*.flags
- + rm -f ../../sta/.*.d
- endif
- endif
- 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
- --- DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/os/linux/pci_main_dev.c 2010-12-17 12:44:47.000000000 +0100
- +++ 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
- @@ -301,7 +301,7 @@
- PRTMP_ADAPTER pAd = (PRTMP_ADAPTER)NULL;
- struct net_device *net_dev;
- PVOID handle;
- - PSTRING print_name;
- + const char* print_name;
- ULONG csr_addr;
- INT rv = 0;
- RTMP_OS_NETDEV_OP_HOOK netDevHook;
- 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
- --- DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/os/linux/rt_linux.c 2010-12-17 12:44:47.000000000 +0100
- +++ DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217_patched/os/linux/rt_linux.c 2013-01-09 11:23:40.078069009 +0100
- @@ -479,9 +479,9 @@
- MEM_DBG_PKT_ALLOC_INC(pAd);
- skb_reserve(skb, 2);
- - NdisMoveMemory(skb->tail, pHeader802_3, HdrLen);
- + NdisMoveMemory(GET_OS_PKT_DATATAIL(skb), pHeader802_3, HdrLen);
- skb_put(skb, HdrLen);
- - NdisMoveMemory(skb->tail, pData, DataSize);
- + NdisMoveMemory(GET_OS_PKT_DATATAIL(skb), pData, DataSize);
- skb_put(skb, DataSize);
- skb->dev = get_netdev_from_bssid(pAd, FromWhichBSSID);
- pPacket = OSPKT_TO_RTPKT(skb);
- @@ -628,10 +628,10 @@
- {
- // set the correct dataptr and data len
- MEM_DBG_PKT_ALLOC_INC(pAd);
- - pClonedPkt->dev = pRxPkt->dev;
- - pClonedPkt->data = pData;
- - pClonedPkt->len = DataSize;
- - pClonedPkt->tail = pClonedPkt->data + pClonedPkt->len;
- + SET_OS_PKT_NETDEV(pClonedPkt, pRxPkt->dev);
- + SET_OS_PKT_DATAPTR(pClonedPkt, pData);
- + SET_OS_PKT_LEN(pClonedPkt, DataSize);
- + SET_OS_PKT_DATATAIL(pClonedPkt, pData, DataSize);
- ASSERT(DataSize < 1530);
- }
- return pClonedPkt;
- @@ -650,10 +650,10 @@
- ASSERT(pRxBlk->pRxPacket);
- pOSPkt = RTPKT_TO_OSPKT(pRxBlk->pRxPacket);
- - pOSPkt->dev = get_netdev_from_bssid(pAd, FromWhichBSSID);
- - pOSPkt->data = pRxBlk->pData;
- - pOSPkt->len = pRxBlk->DataSize;
- - pOSPkt->tail = pOSPkt->data + pOSPkt->len;
- + SET_OS_PKT_NETDEV(pOSPkt, get_netdev_from_bssid(pAd, FromWhichBSSID));
- + SET_OS_PKT_DATAPTR(pOSPkt, pRxBlk->pData);
- + SET_OS_PKT_LEN(pOSPkt, pRxBlk->DataSize);
- + SET_OS_PKT_DATATAIL(pOSPkt, pRxBlk->pData, pRxBlk->DataSize);
- }
- @@ -671,10 +671,10 @@
- pOSPkt = RTPKT_TO_OSPKT(pRxBlk->pRxPacket);
- - pOSPkt->dev = get_netdev_from_bssid(pAd, FromWhichBSSID);
- - pOSPkt->data = pRxBlk->pData;
- - pOSPkt->len = pRxBlk->DataSize;
- - pOSPkt->tail = pOSPkt->data + pOSPkt->len;
- + SET_OS_PKT_NETDEV(pOSPkt, get_netdev_from_bssid(pAd, FromWhichBSSID));
- + SET_OS_PKT_DATAPTR(pOSPkt, pRxBlk->pData);
- + SET_OS_PKT_LEN(pOSPkt, pRxBlk->DataSize);
- + SET_OS_PKT_DATATAIL(pOSPkt, pRxBlk->pData, pRxBlk->DataSize);
- //
- // copy 802.3 header
- @@ -996,9 +996,9 @@
- skb_put(pOSPkt,(pRxBlk->DataSize - pOSPkt->len));
- } //end if
- - if ((pRxBlk->pData - pOSPkt->data) > 0) {
- - skb_put(pOSPkt,(pRxBlk->pData - pOSPkt->data));
- - skb_pull(pOSPkt,(pRxBlk->pData - pOSPkt->data));
- + if ((pRxBlk->pData - GET_OS_PKT_DATAPTR(pOSPkt)) > 0) {
- + skb_put(pOSPkt, (pRxBlk->pData - GET_OS_PKT_DATAPTR(pOSPkt)));
- + skb_pull(pOSPkt, (pRxBlk->pData - GET_OS_PKT_DATAPTR(pOSPkt)));
- } //end if
- if (skb_headroom(pOSPkt) < (sizeof(wlan_ng_prism2_header)+ header_len)) {
- @@ -1696,13 +1696,17 @@
- void RtmpOSNetDevDetach(PNET_DEV pNetDev)
- {
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
- - struct net_device_ops *pNetDevOps = pNetDev->netdev_ops;
- + union {
- + const struct net_device_ops *const_ops;
- + struct net_device_ops *ops;
- + } pNetDevOps;
- + pNetDevOps.const_ops = pNetDev->netdev_ops;;
- #endif
- unregister_netdev(pNetDev);
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
- - vfree(pNetDevOps);
- + vfree(pNetDevOps.ops);
- #endif
- }
- @@ -1733,7 +1737,11 @@
- int ret, rtnl_locked = FALSE;
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
- - struct net_device_ops *pNetDevOps = pNetDev->netdev_ops;
- + union {
- + const struct net_device_ops *const_ops;
- + struct net_device_ops *ops;
- + } pNetDevOps;
- + pNetDevOps.const_ops = pNetDev->netdev_ops;;
- #endif
- DBGPRINT(RT_DEBUG_TRACE, ("RtmpOSNetDevAttach()--->\n"));
- @@ -1746,10 +1754,10 @@
- GET_PAD_FROM_NET_DEV(pAd, pNetDev);
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
- - pNetDevOps->ndo_open = pDevOpHook->open;
- - pNetDevOps->ndo_stop = pDevOpHook->stop;
- - pNetDevOps->ndo_start_xmit = (HARD_START_XMIT_FUNC)(pDevOpHook->xmit);
- - pNetDevOps->ndo_do_ioctl = pDevOpHook->ioctl;
- + pNetDevOps.ops->ndo_open = pDevOpHook->open;
- + pNetDevOps.ops->ndo_stop = pDevOpHook->stop;
- + pNetDevOps.ops->ndo_start_xmit = (HARD_START_XMIT_FUNC)(pDevOpHook->xmit);
- + pNetDevOps.ops->ndo_do_ioctl = pDevOpHook->ioctl;
- #else
- pNetDev->open = pDevOpHook->open;
- pNetDev->stop = pDevOpHook->stop;
- @@ -1766,7 +1774,7 @@
- */
- if (pDevOpHook->get_stats)
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
- - pNetDevOps->ndo_get_stats = pDevOpHook->get_stats;
- + pNetDevOps.ops->ndo_get_stats = pDevOpHook->get_stats;
- #else
- pNetDev->get_stats = pDevOpHook->get_stats;
- #endif
- @@ -1817,7 +1825,7 @@
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
- - pNetDevOps->ndo_validate_addr = NULL;
- + pNetDevOps.ops->ndo_validate_addr = NULL;
- //pNetDev->netdev_ops = ops;
- #else
- pNetDev->validate_addr = NULL;
- 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
- --- DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217/os/linux/rt_main_dev.c 2010-12-17 12:44:47.000000000 +0100
- +++ 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
- @@ -1247,7 +1247,7 @@
- RTMP_OS_TASK *pTask;
- if (pAd->bWriteDat == FALSE)
- - return;
- + return status;
- DBGPRINT(RT_DEBUG_TRACE, ("-->WriteDatThreadInit()\n"));
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement