Guest User

markus

a guest
Sep 9th, 2008
240
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. diff -Naur 2008_0708_RT2860_Linux_STA_v1.7.0.0/Makefile rt2860/Makefile
  2. --- 2008_0708_RT2860_Linux_STA_v1.7.0.0/Makefile 2008-07-01 03:20:26.000000000 +0200
  3. +++ rt2860/Makefile 2008-08-16 02:17:37.000000000 +0200
  4. @@ -101,11 +101,9 @@
  5. ifneq (,$(findstring 2.4,$(LINUX_SRC)))
  6. cp -f os/linux/Makefile.4 $(RT28xx_DIR)/os/linux/Makefile
  7. make -C $(RT28xx_DIR)/os/linux/
  8. - cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.o /tftpboot
  9. else
  10. cp -f os/linux/Makefile.6 $(RT28xx_DIR)/os/linux/Makefile
  11. make -C $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules
  12. - cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot
  13. endif
  14.  
  15. clean:
  16. diff -Naur 2008_0708_RT2860_Linux_STA_v1.7.0.0/common/mlme.c rt2860/common/mlme.c
  17. --- 2008_0708_RT2860_Linux_STA_v1.7.0.0/common/mlme.c 2008-07-08 14:33:32.000000000 +0200
  18. +++ rt2860/common/mlme.c 2008-07-15 09:30:36.000000000 +0200
  19. @@ -772,6 +772,21 @@
  20. ULONG TxTotalCnt;
  21. PRTMP_ADAPTER pAd = (RTMP_ADAPTER *)FunctionContext;
  22.  
  23. +#ifdef EEEPC_SPECIAL_SETTING
  24. + //Baron 2008/07/10
  25. + //printk("Baron_Test:\t%s", RTMPGetRalinkEncryModeStr(pAd->StaCfg.WepStatus));
  26. + //If the STA security setting is OPEN or WEP, pAd->StaCfg.WpaSupplicantUP = 0.
  27. + //If the STA security setting is WPAPSK or WPA2PSK, pAd->StaCfg.WpaSupplicantUP = 1.
  28. + if(pAd->StaCfg.WepStatus<2)
  29. + {
  30. + pAd->StaCfg.WpaSupplicantUP = 0;
  31. + }
  32. + else
  33. + {
  34. + pAd->StaCfg.WpaSupplicantUP = 1;
  35. + }
  36. +#endif
  37. +
  38. #ifdef CONFIG_STA_SUPPORT
  39. #ifdef RT2860
  40. IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
  41. diff -Naur 2008_0708_RT2860_Linux_STA_v1.7.0.0/include/rt_linux.h rt2860/include/rt_linux.h
  42. --- 2008_0708_RT2860_Linux_STA_v1.7.0.0/include/rt_linux.h 2008-07-01 04:27:10.000000000 +0200
  43. +++ rt2860/include/rt_linux.h 2008-08-16 00:50:14.000000000 +0200
  44. @@ -313,10 +313,6 @@
  45.  
  46. #define DBGPRINT_RAW(Level, Fmt) \
  47. { \
  48. - if (Level <= RTDebugLevel) \
  49. - { \
  50. - printk Fmt; \
  51. - } \
  52. }
  53.  
  54. #define DBGPRINT(Level, Fmt) DBGPRINT_RAW(Level, Fmt)
  55. diff -Naur 2008_0708_RT2860_Linux_STA_v1.7.0.0/os/linux/config.mk rt2860/os/linux/config.mk
  56. --- 2008_0708_RT2860_Linux_STA_v1.7.0.0/os/linux/config.mk 2008-07-07 16:37:50.000000000 +0200
  57. +++ rt2860/os/linux/config.mk 2008-07-15 09:38:32.000000000 +0200
  58. @@ -5,10 +5,10 @@
  59. HAS_28xx_QA=n
  60.  
  61. # Support Wpa_Supplicant
  62. -HAS_WPA_SUPPLICANT=n
  63. +HAS_WPA_SUPPLICANT=y
  64.  
  65. # Support Native WpaSupplicant for Network Maganger
  66. -HAS_NATIVE_WPA_SUPPLICANT_SUPPORT=n
  67. +HAS_NATIVE_WPA_SUPPLICANT_SUPPORT=y
  68.  
  69. #Support Net interface block while Tx-Sw queue full
  70. HAS_BLOCK_NET_IF=n
  71. @@ -45,12 +45,18 @@
  72. #Support features of 802.11n Draft3
  73. HAS_DOT11N_DRAFT3_SUPPORT=n
  74.  
  75. +#Support EeePC Special setting
  76. +HAS_EEEPC_SPECIAL_SETTING=y
  77.  
  78. CC := $(CROSS_COMPILE)gcc
  79. LD := $(CROSS_COMPILE)ld
  80.  
  81. WFLAGS := -DAGGREGATION_SUPPORT -DPIGGYBACK_SUPPORT -DWMM_SUPPORT -DLINUX -Wall -Wstrict-prototypes -Wno-trigraphs
  82.  
  83. +ifeq ($(HAS_EEEPC_SPECIAL_SETTING),y)
  84. +WFLAGS += -DEEEPC_SPECIAL_SETTING
  85. +endif
  86. +
  87. ifeq ($(RT28xx_MODE),STA)
  88. WFLAGS += -DCONFIG_STA_SUPPORT -DDBG
  89.  
  90. diff -Naur 2008_0708_RT2860_Linux_STA_v1.7.0.0/os/linux/rt_main_dev.c rt2860/os/linux/rt_main_dev.c
  91. --- 2008_0708_RT2860_Linux_STA_v1.7.0.0/os/linux/rt_main_dev.c 2008-07-01 05:31:10.000000000 +0200
  92. +++ rt2860/os/linux/rt_main_dev.c 2008-08-16 02:20:19.000000000 +0200
  93. @@ -801,7 +801,7 @@
  94.  
  95. #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
  96. #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
  97. - device = dev_get_by_name(dev->nd_net, slot_name);
  98. + device = dev_get_by_name(dev_net(dev), slot_name);
  99. #else
  100. device = dev_get_by_name(slot_name);
  101. #endif
  102.  
RAW Paste Data