rpms/rt3070-kmod/devel rt3070-no2.4-in-kernelversion.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 rt3070-2.6.29-compile.patch, 1.2, 1.3 rt3070-Makefile.x-fixes.patch, 1.1, 1.2 rt3070-NetworkManager-support.patch, 1.1, 1.2 rt3070-kmod.spec, 1.10, 1.11 rt3070-strip-tftpboot-copy.patch, 1.1, 1.2 sources, 1.2, 1.3 rt3070-2.6.25-iwe_stream-fix.patch, 1.1, NONE

Orcan Ogetbil oget at rpmfusion.org
Sat May 23 07:18:50 CEST 2009 

Author: oget

Update of /cvs/free/rpms/rt3070-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3574

Modified Files:
	.cvsignore rt3070-2.6.29-compile.patch 
	rt3070-Makefile.x-fixes.patch 
	rt3070-NetworkManager-support.patch rt3070-kmod.spec 
	rt3070-strip-tftpboot-copy.patch sources 
Added Files:
	rt3070-no2.4-in-kernelversion.patch 
Removed Files:
	rt3070-2.6.25-iwe_stream-fix.patch 
Log Message:
* Sat May 23 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.1.0-1
- update to 2.1.1.0


rt3070-no2.4-in-kernelversion.patch:

--- NEW FILE rt3070-no2.4-in-kernelversion.patch ---
diff -rupN 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/config.mk 2009_0302_RT2870_Linux_STA_v2.1.0.0/os/linux/config.mk
--- 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/config.mk	2009-03-10 00:47:50.000000000 -0400
+++ 2009_0302_RT2870_Linux_STA_v2.1.0.0/os/linux/config.mk	2009-03-26 01:57:12.000000000 -0400
@@ -236,14 +236,14 @@ export CFLAGS
 endif
 
 ifeq ($(PLATFORM),PC)
-    ifneq (,$(findstring 2.4,$(LINUX_SRC)))
+	#    ifneq (,$(findstring 2.4,$(LINUX_SRC)))
 	# Linux 2.4
-	CFLAGS := -D__KERNEL__ -I$(LINUX_SRC)/include -I$(RT28xx_DIR)/include -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -DMODULE -DMODVERSIONS -include $(LINUX_SRC)/include/linux/modversions.h $(WFLAGS)
-	export CFLAGS
-    else
+	#	CFLAGS := -D__KERNEL__ -I$(LINUX_SRC)/include -I$(RT28xx_DIR)/include -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=i686 -DMODULE -DMODVERSIONS -include $(LINUX_SRC)/include/linux/modversions.h $(WFLAGS)
+	#	export CFLAGS
+	#    else
 	# Linux 2.6
 	EXTRA_CFLAGS := $(WFLAGS) -I$(RT28xx_DIR)/include
-    endif
+	#    endif
 endif
 
 ifeq ($(PLATFORM),IXP)


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/rt3070-kmod/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	22 Feb 2009 16:46:12 -0000	1.2
+++ .cvsignore	23 May 2009 05:18:50 -0000	1.3
@@ -1 +1 @@
-2008_1225_RT3070_Linux_STA_v2.0.1.0.tar.bz2
+2009_0520_RT3070_Linux_STA_v2.1.1.0.tar.gz

rt3070-2.6.29-compile.patch:

Index: rt3070-2.6.29-compile.patch
===================================================================
RCS file: /cvs/free/rpms/rt3070-kmod/devel/rt3070-2.6.29-compile.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rt3070-2.6.29-compile.patch	22 Feb 2009 18:07:43 -0000	1.2
+++ rt3070-2.6.29-compile.patch	23 May 2009 05:18:50 -0000	1.3
@@ -1,606 +1,450 @@
-diff -rupN old/2008_1225_RT3070_Linux_STA_v2.0.1.0/common/2870_rtmp_init.c new/2008_1225_RT3070_Linux_STA_v2.0.1.0/common/2870_rtmp_init.c
---- old/2008_1225_RT3070_Linux_STA_v2.0.1.0/common/2870_rtmp_init.c	2008-12-24 01:24:20.000000000 -0500
-+++ new/2008_1225_RT3070_Linux_STA_v2.0.1.0/common/2870_rtmp_init.c	2009-02-22 12:41:55.000000000 -0500
-@@ -751,7 +751,7 @@ Note:
- NDIS_STATUS	 CreateThreads( 
- 	IN	struct net_device *net_dev)
- {
--	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) net_dev->priv;
-+	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) net_dev->ml_priv;
- 	POS_COOKIE pObj = (POS_COOKIE) pAd->OS_Cookie;
- 
- 	//init_MUTEX(&(pAd->usbdev_semaphore));
-diff -rupN old/2008_1225_RT3070_Linux_STA_v2.0.1.0/common/eeprom.c new/2008_1225_RT3070_Linux_STA_v2.0.1.0/common/eeprom.c
---- old/2008_1225_RT3070_Linux_STA_v2.0.1.0/common/eeprom.c	2008-12-24 01:33:02.000000000 -0500
-+++ new/2008_1225_RT3070_Linux_STA_v2.0.1.0/common/eeprom.c	2009-02-22 12:48:02.000000000 -0500
-@@ -1065,9 +1065,9 @@ INT	set_eFuseLoadFromBin_Proc(
- 		kfree(buffer);
- 		return FALSE;
- 	}
--	orgfsuid = current->fsuid;
--	orgfsgid = current->fsgid;
--	current->fsuid=current->fsgid = 0;
-+	orgfsuid = current_fsuid();
-+	orgfsgid = current_fsgid();
-+	/*current->fsuid=current->fsgid = 0;*/
-     	orgfs = get_fs();
-    	 set_fs(KERNEL_DS);
- 
-@@ -1130,8 +1130,10 @@ INT	set_eFuseLoadFromBin_Proc(
- 		DBGPRINT(RT_DEBUG_TRACE, ("--> Error %d closing %s\n", -retval, src));
- 	}
- 	set_fs(orgfs);
-+#if 0
- 	current->fsuid = orgfsuid;
- 	current->fsgid = orgfsgid;
-+#endif
- 	for(j=0;j<i;j++)
- 	{
- 		DBGPRINT(RT_DEBUG_TRACE, ("%02X ",buffer[j]));
-diff -rupN old/2008_1225_RT3070_Linux_STA_v2.0.1.0/os/linux/rt_main_dev.c new/2008_1225_RT3070_Linux_STA_v2.0.1.0/os/linux/rt_main_dev.c
---- old/2008_1225_RT3070_Linux_STA_v2.0.1.0/os/linux/rt_main_dev.c	2008-12-24 02:36:30.000000000 -0500
-+++ new/2008_1225_RT3070_Linux_STA_v2.0.1.0/os/linux/rt_main_dev.c	2009-02-22 12:41:55.000000000 -0500
-@@ -133,7 +133,7 @@ Note:
- */
- int MainVirtualIF_close(IN struct net_device *net_dev)
- {
--    RTMP_ADAPTER *pAd = net_dev->priv;
-+    RTMP_ADAPTER *pAd = net_dev->ml_priv;
- 
- 	// Sanity check for pAd
- 	if (pAd == NULL)
-@@ -173,7 +173,7 @@ Note:
- */
- int MainVirtualIF_open(IN struct net_device *net_dev)
- {
--    RTMP_ADAPTER *pAd = net_dev->priv;
-+    RTMP_ADAPTER *pAd = net_dev->ml_priv;
- 
- 	// Sanity check for pAd
- 	if (pAd == NULL)
-@@ -215,7 +215,7 @@ Note:
- int rt28xx_close(IN PNET_DEV dev)
- {
- 	struct net_device * net_dev = (struct net_device *)dev;
--    RTMP_ADAPTER	*pAd = net_dev->priv;
-+    RTMP_ADAPTER	*pAd = net_dev->ml_priv;
- 	BOOLEAN 		Cancelled = FALSE;
- 	UINT32			i = 0;
- #ifdef RT2870
-@@ -428,7 +428,7 @@ int rt28xx_close(IN PNET_DEV dev)
- 
- static int rt28xx_init(IN struct net_device *net_dev)
- {
--	PRTMP_ADAPTER 			pAd = (PRTMP_ADAPTER)net_dev->priv;
-+	PRTMP_ADAPTER 			pAd = (PRTMP_ADAPTER)net_dev->ml_priv;
- 	UINT					index;
- 	UCHAR					TmpPhy;
- //	ULONG					Value=0;
-@@ -695,8 +695,8 @@ err1:
- #endif // DOT11_N_SUPPORT //
- 	RT28XX_IRQ_RELEASE(net_dev);
- 
--	// shall not set priv to NULL here because the priv didn't been free yet.
--	//net_dev->priv = 0;
-+	// shall not set ml_priv to NULL here because the ml_priv didn't been free yet.
-+	//net_dev->ml_priv = 0;
- #ifdef INF_AMAZON_SE
- err0:
- #endif // INF_AMAZON_SE //
-@@ -723,7 +723,7 @@ Note:
- int rt28xx_open(IN PNET_DEV dev)
- {				 
- 	struct net_device * net_dev = (struct net_device *)dev;
--	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER)net_dev->priv;
-+	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER)net_dev->ml_priv;
- 	int retval = 0;
-  	POS_COOKIE pObj;
- 
-@@ -732,7 +732,7 @@ int rt28xx_open(IN PNET_DEV dev)
- 	if (pAd == NULL)
- 	{
- 		/* if 1st open fail, pAd will be free;
--		   So the net_dev->priv will be NULL in 2rd open */
-+		   So the net_dev->ml_priv will be NULL in 2rd open */
- 		return -1;
- 	}
- 
-@@ -1410,7 +1410,7 @@ INT __devinit   rt28xx_probe(
- 	if (status != NDIS_STATUS_SUCCESS) 
- 		goto err_out_free_netdev;
- 
--	net_dev->priv = (PVOID)pAd;
-+	net_dev->ml_priv = (PVOID)pAd;
-     pAd->net_dev = net_dev; // must be before RT28XXNetDevInit()
- 
- 	RT28XXNetDevInit(_dev_p, net_dev, pAd);
-@@ -1511,7 +1511,7 @@ Note:
- int rt28xx_packet_xmit(struct sk_buff *skb)
- {
- 	struct net_device *net_dev = skb->dev;
--	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) net_dev->priv;
-+	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) net_dev->ml_priv;
- 	int status = 0;
- 	PNDIS_PACKET pPacket = (PNDIS_PACKET) skb;
- 
-@@ -1591,7 +1591,7 @@ INT rt28xx_send_packets(
- 	IN struct sk_buff 		*skb_p, 
- 	IN struct net_device 	*net_dev)
- {
--    RTMP_ADAPTER *pAd = net_dev->priv;
-+    RTMP_ADAPTER *pAd = net_dev->ml_priv;
- 
- 	if (!(net_dev->flags & IFF_UP))
- 	{
-@@ -1633,7 +1633,7 @@ struct net_device *alloc_netdev(
+diff -rupN 2009_0520_RT3070_Linux_STA_v2.1.1.0.old/os/linux/rt_linux.c 2009_0520_RT3070_Linux_STA_v2.1.1.0/os/linux/rt_linux.c
+--- 2009_0520_RT3070_Linux_STA_v2.1.1.0.old/os/linux/rt_linux.c	2009-05-20 22:00:29.000000000 -0400
++++ 2009_0520_RT3070_Linux_STA_v2.1.1.0/os/linux/rt_linux.c	2009-05-22 23:54:59.000000000 -0400
+@@ -1267,7 +1267,11 @@ struct net_device *alloc_netdev(
      memset(dev, 0, alloc_size);
  
      if (sizeof_priv)
--        dev->priv = (void *) (((long)(dev + 1) + 31) & ~31);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+         dev->priv = (void *) (((long)(dev + 1) + 31) & ~31);
++#else
 +        dev->ml_priv = (void *) (((long)(dev + 1) + 31) & ~31);
++#endif
  
      setup(dev);
      strcpy(dev->name, mask);
-@@ -1654,7 +1654,7 @@ void CfgInitHook(PRTMP_ADAPTER pAd)
- struct iw_statistics *rt28xx_get_wireless_stats(
-     IN struct net_device *net_dev)
- {
--	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) net_dev->priv;
-+	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) net_dev->ml_priv;
- 
- 
- 	DBGPRINT(RT_DEBUG_TRACE, ("rt28xx_get_wireless_stats --->\n"));
-@@ -1706,18 +1706,18 @@ INT rt28xx_ioctl(
- 
- 	if (net_dev->priv_flags == INT_MAIN)
- 	{
--		pAd = net_dev->priv;
-+		pAd = net_dev->ml_priv;
- 	}
- 	else
- 	{
--		pVirtualAd = net_dev->priv;
--		pAd = pVirtualAd->RtmpDev->priv;
-+		pVirtualAd = net_dev->ml_priv;
-+		pAd = pVirtualAd->RtmpDev->ml_priv;
- 	}
- 
- 	if (pAd == NULL)
- 	{
- 		/* if 1st open fail, pAd will be free;
--		   So the net_dev->priv will be NULL in 2rd open */
-+		   So the net_dev->ml_priv will be NULL in 2rd open */
- 		return -ENETDOWN;
- 	}
- 
-@@ -1754,7 +1754,7 @@ struct net_device_stats *RT28xx_get_ethe
-     RTMP_ADAPTER *pAd = NULL;
- 
- 	if (net_dev)
--		pAd = net_dev->priv;
-+		pAd = net_dev->ml_priv;
- 
- 	if (pAd)
- 	{
-diff -rupN old/2008_1225_RT3070_Linux_STA_v2.0.1.0/os/linux/rt_profile.c new/2008_1225_RT3070_Linux_STA_v2.0.1.0/os/linux/rt_profile.c
---- old/2008_1225_RT3070_Linux_STA_v2.0.1.0/os/linux/rt_profile.c	2008-12-24 02:06:26.000000000 -0500
-+++ new/2008_1225_RT3070_Linux_STA_v2.0.1.0/os/linux/rt_profile.c	2009-02-22 12:41:55.000000000 -0500
-@@ -925,9 +925,9 @@ NDIS_STATUS	RTMPReadParametersHook(
- 
- 	// Save uid and gid used for filesystem access.
- 	// Set user and group to 0 (root)	
--	orgfsuid = current->fsuid;
--	orgfsgid = current->fsgid;
--	current->fsuid=current->fsgid = 0;
-+	orgfsuid = current_fsuid();
-+	orgfsgid = current_fsgid();
-+	/*	current->fsuid=current->fsgid = 0;*/
-     orgfs = get_fs();
-     set_fs(KERNEL_DS);
- 
-@@ -1608,9 +1608,10 @@ NDIS_STATUS	RTMPReadParametersHook(
- 	}
- 
- 	set_fs(orgfs);
-+#if 0
- 	current->fsuid = orgfsuid;
- 	current->fsgid = orgfsgid;
--
-+#endif
- 	kfree(buffer);
- 	kfree(tmpbuf);
- 
-diff -rupN old/2008_1225_RT3070_Linux_STA_v2.0.1.0/os/linux/sta_ioctl.c new/2008_1225_RT3070_Linux_STA_v2.0.1.0/os/linux/sta_ioctl.c
---- old/2008_1225_RT3070_Linux_STA_v2.0.1.0/os/linux/sta_ioctl.c	2008-12-23 21:54:58.000000000 -0500
-+++ new/2008_1225_RT3070_Linux_STA_v2.0.1.0/os/linux/sta_ioctl.c	2009-02-22 12:41:55.000000000 -0500
-@@ -579,7 +579,7 @@ rt_ioctl_giwname(struct net_device *dev,
- 		   struct iw_request_info *info,
- 		   char *name, char *extra)
- {
--//	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
-+//	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
- 
- #ifdef RT2870
- 	strncpy(name, "RT2870 Wireless", IFNAMSIZ);
-@@ -591,7 +591,7 @@ int rt_ioctl_siwfreq(struct net_device *
+diff -rupN 2009_0520_RT3070_Linux_STA_v2.1.1.0.old/os/linux/sta_ioctl.c 2009_0520_RT3070_Linux_STA_v2.1.1.0/os/linux/sta_ioctl.c
+--- 2009_0520_RT3070_Linux_STA_v2.1.1.0.old/os/linux/sta_ioctl.c	2009-05-20 22:00:29.000000000 -0400
++++ 2009_0520_RT3070_Linux_STA_v2.1.1.0/os/linux/sta_ioctl.c	2009-05-23 00:06:52.000000000 -0400
+@@ -647,7 +647,11 @@ int rt_ioctl_siwfreq(struct net_device *
  			struct iw_request_info *info,
  			struct iw_freq *freq, char *extra)
  {
--	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+ 	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++#else
 +	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
++#endif
  	int 	chan = -1;
  
      //check if the interface is down
-@@ -631,18 +631,18 @@ int rt_ioctl_giwfreq(struct net_device *
- 
- 	if (dev->priv_flags == INT_MAIN)
- 	{
--		pAdapter = dev->priv;
-+		pAdapter = dev->ml_priv;
- 	}
- 	else
- 	{
--		pVirtualAd = dev->priv;
--		pAdapter = pVirtualAd->RtmpDev->priv;
-+		pVirtualAd = dev->ml_priv;
-+		pAdapter = pVirtualAd->RtmpDev->ml_priv;
- 	}
- 
+@@ -686,7 +690,11 @@ int rt_ioctl_giwfreq(struct net_device *
+ 	UCHAR ch;
+ 	ULONG	m = 2412000;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+ 	pAdapter = dev->priv;
++#else
++	pAdapter = dev->ml_priv;
++#endif
  	if (pAdapter == NULL)
  	{
  		/* if 1st open fail, pAd will be free;
--		   So the net_dev->priv will be NULL in 2rd open */
-+		   So the net_dev->ml_priv will be NULL in 2rd open */
- 		return -ENETDOWN;
- 	}
- 
-@@ -660,7 +660,7 @@ int rt_ioctl_siwmode(struct net_device *
+@@ -709,7 +717,11 @@ int rt_ioctl_siwmode(struct net_device *
  		   struct iw_request_info *info,
  		   __u32 *mode, char *extra)
  {
--	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+ 	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++#else
 +	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
++#endif
  
  	//check if the interface is down
      if(!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE))
-@@ -697,7 +697,7 @@ int rt_ioctl_giwmode(struct net_device *
+@@ -747,7 +759,11 @@ int rt_ioctl_giwmode(struct net_device *
  		   struct iw_request_info *info,
  		   __u32 *mode, char *extra)
  {
--	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+ 	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++#else
 +	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
++#endif
  
- 	if (ADHOC_ON(pAdapter))
- 		*mode = IW_MODE_ADHOC;
-@@ -720,7 +720,7 @@ int rt_ioctl_siwsens(struct net_device *
+ 	if (pAdapter == NULL)
+ 	{
+@@ -777,7 +793,11 @@ int rt_ioctl_siwsens(struct net_device *
  		   struct iw_request_info *info,
  		   char *name, char *extra)
  {
--	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+ 	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++#else
 +	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
++#endif
  
  	//check if the interface is down
      	if(!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE))
-@@ -743,7 +743,7 @@ int rt_ioctl_giwrange(struct net_device 
+@@ -800,7 +820,11 @@ int rt_ioctl_giwrange(struct net_device 
  		   struct iw_request_info *info,
  		   struct iw_point *data, char *extra)
  {
--	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+ 	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++#else
 +	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
- 
++#endif
  	struct iw_range *range = (struct iw_range *) extra;
  	u16 val;
-@@ -827,7 +827,7 @@ int rt_ioctl_siwap(struct net_device *de
+ 	int i;
+@@ -890,7 +914,11 @@ int rt_ioctl_siwap(struct net_device *de
  		      struct iw_request_info *info,
  		      struct sockaddr *ap_addr, char *extra)
  {
--	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+ 	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++#else
 +	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
++#endif
      NDIS_802_11_MAC_ADDRESS Bssid;
  
  	//check if the interface is down
-@@ -867,7 +867,7 @@ int rt_ioctl_giwap(struct net_device *de
+@@ -930,7 +958,11 @@ int rt_ioctl_giwap(struct net_device *de
  		      struct iw_request_info *info,
  		      struct sockaddr *ap_addr, char *extra)
  {
--	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;    
-+	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;    
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+ 	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++#else
++	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
++#endif
  
- 	if (INFRA_ON(pAdapter) || ADHOC_ON(pAdapter))
+ 	if (pAdapter == NULL)
  	{
-@@ -935,7 +935,7 @@ int rt_ioctl_iwaplist(struct net_device 
+@@ -1005,7 +1037,11 @@ int rt_ioctl_iwaplist(struct net_device 
  			struct iw_request_info *info,
  			struct iw_point *data, char *extra)
  {
-- 	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+  	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++#else
 + 	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
++#endif
  
  	struct sockaddr addr[IW_MAX_AP];
  	struct iw_quality qual[IW_MAX_AP];
-@@ -971,7 +971,7 @@ int rt_ioctl_siwscan(struct net_device *
+@@ -1041,7 +1077,11 @@ int rt_ioctl_siwscan(struct net_device *
  			struct iw_request_info *info,
  			struct iw_point *data, char *extra)
  {
--	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+ 	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++#else
 +	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
++#endif
  
  	ULONG								Now;
  	int Status = NDIS_STATUS_SUCCESS;
-@@ -1053,7 +1053,7 @@ int rt_ioctl_giwscan(struct net_device *
+@@ -1123,7 +1163,11 @@ int rt_ioctl_giwscan(struct net_device *
  			struct iw_point *data, char *extra)
  {
  
--	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+ 	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++#else
 +	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
++#endif
  	int i=0;
- 	char *current_ev = extra, *previous_ev = extra;
- 	char *end_buf;
-@@ -1421,7 +1421,7 @@ int rt_ioctl_siwessid(struct net_device 
+ 	PSTRING current_ev = extra, previous_ev = extra;
+ 	PSTRING end_buf;
+@@ -1506,7 +1550,11 @@ int rt_ioctl_siwessid(struct net_device 
  			 struct iw_request_info *info,
  			 struct iw_point *data, char *essid)
  {
--	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+ 	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++#else
 +	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
++#endif
  
  	//check if the interface is down
      if(!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE))
-@@ -1462,7 +1462,7 @@ int rt_ioctl_giwessid(struct net_device 
+@@ -1547,7 +1595,11 @@ int rt_ioctl_giwessid(struct net_device 
  			 struct iw_request_info *info,
  			 struct iw_point *data, char *essid)
  {
--	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+ 	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++#else
 +	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
- 	
- 	data->flags = 1;		
-     if (MONITOR_ON(pAdapter))
-@@ -1501,7 +1501,7 @@ int rt_ioctl_siwnickn(struct net_device 
++#endif
+ 
+ 	if (pAdapter == NULL)
+ 	{
+@@ -1593,7 +1645,11 @@ int rt_ioctl_siwnickn(struct net_device 
  			 struct iw_request_info *info,
  			 struct iw_point *data, char *nickname)
  {
--	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+ 	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++#else
 +	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
++#endif
  
      //check if the interface is down
      if(!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE))
-@@ -1524,7 +1524,7 @@ int rt_ioctl_giwnickn(struct net_device 
+@@ -1616,7 +1672,11 @@ int rt_ioctl_giwnickn(struct net_device 
  			 struct iw_request_info *info,
  			 struct iw_point *data, char *nickname)
  {
--	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+ 	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++#else
 +	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
++#endif
  
- 	if (data->length > strlen(pAdapter->nickname) + 1)
- 		data->length = strlen(pAdapter->nickname) + 1;
-@@ -1539,7 +1539,7 @@ int rt_ioctl_siwrts(struct net_device *d
+ 	if (pAdapter == NULL)
+ 	{
+@@ -1638,7 +1698,11 @@ int rt_ioctl_siwrts(struct net_device *d
  		       struct iw_request_info *info,
  		       struct iw_param *rts, char *extra)
  {
--	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+ 	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++#else
 +	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
++#endif
  	u16 val;
  
      //check if the interface is down
-@@ -1568,7 +1568,7 @@ int rt_ioctl_giwrts(struct net_device *d
+@@ -1667,7 +1731,11 @@ int rt_ioctl_giwrts(struct net_device *d
  		       struct iw_request_info *info,
  		       struct iw_param *rts, char *extra)
  {
--	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+ 	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++#else
 +	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
++#endif
  
- 	//check if the interface is down
-     	if(!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE))
-@@ -1588,7 +1588,7 @@ int rt_ioctl_siwfrag(struct net_device *
+ 	if (pAdapter == NULL)
+ 	{
+@@ -1694,7 +1762,11 @@ int rt_ioctl_siwfrag(struct net_device *
  			struct iw_request_info *info,
  			struct iw_param *frag, char *extra)
  {
--	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+ 	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++#else
 +	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
++#endif
  	u16 val;
  
  	//check if the interface is down
-@@ -1615,7 +1615,7 @@ int rt_ioctl_giwfrag(struct net_device *
+@@ -1721,7 +1793,11 @@ int rt_ioctl_giwfrag(struct net_device *
  			struct iw_request_info *info,
  			struct iw_param *frag, char *extra)
  {
--	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+ 	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++#else
 +	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
++#endif
  
- 	//check if the interface is down
-     	if(!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE))
-@@ -1637,7 +1637,7 @@ int rt_ioctl_siwencode(struct net_device
+ 	if (pAdapter == NULL)
+ 	{
+@@ -1750,7 +1826,11 @@ int rt_ioctl_siwencode(struct net_device
  			  struct iw_request_info *info,
  			  struct iw_point *erq, char *extra)
  {
--	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+ 	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++#else
 +	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
++#endif
  
  	//check if the interface is down
      	if(!RTMP_TEST_FLAG(pAdapter, fRTMP_ADAPTER_INTERRUPT_IN_USE))
-@@ -1744,7 +1744,7 @@ rt_ioctl_giwencode(struct net_device *de
- 			  struct iw_request_info *info,
+@@ -1856,7 +1936,11 @@ rt_ioctl_giwencode(struct net_device *de
  			  struct iw_point *erq, char *key)
  {
--	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
-+	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
  	int kid;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+ 	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->priv;
++#else
++	PRTMP_ADAPTER pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
++#endif
  
- 	//check if the interface is down
-@@ -1811,19 +1811,19 @@ rt_ioctl_setparam(struct net_device *dev
- 	
- 	if (dev->priv_flags == INT_MAIN)
+ 	if (pAdapter == NULL)
  	{
--		pAdapter = dev->priv;
-+		pAdapter = dev->ml_priv;
- 	}
- 	else
- 	{
--		pVirtualAd = dev->priv;
--		pAdapter = pVirtualAd->RtmpDev->priv;
-+		pVirtualAd = dev->ml_priv;
-+		pAdapter = pVirtualAd->RtmpDev->ml_priv;
- 	}
- 	pObj = (POS_COOKIE) pAdapter->OS_Cookie;
- 
+@@ -1926,7 +2010,11 @@ rt_ioctl_setparam(struct net_device *dev
+ 	PSTRING value;
+ 	int  Status=0;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+ 	pAdapter = dev->priv;
++#else
++	pAdapter = dev->ml_priv;
++#endif
  	if (pAdapter == NULL)
  	{
  		/* if 1st open fail, pAd will be free;
--		   So the net_dev->priv will be NULL in 2rd open */
-+		   So the net_dev->ml_priv will be NULL in 2rd open */
- 		return -ENETDOWN;
- 	}
- 
-@@ -1879,7 +1879,7 @@ rt_private_get_statistics(struct net_dev
+@@ -1990,7 +2078,11 @@ rt_private_get_statistics(struct net_dev
  		struct iw_point *wrq, char *extra)
  {
  	INT				Status = 0;
--    PRTMP_ADAPTER   pAd = (PRTMP_ADAPTER) dev->priv;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+     PRTMP_ADAPTER   pAd = (PRTMP_ADAPTER) dev->priv;
++#else
 +    PRTMP_ADAPTER   pAd = (PRTMP_ADAPTER) dev->ml_priv;
++#endif
  
      if (extra == NULL)
      {
-@@ -2006,18 +2006,18 @@ rt_private_show(struct net_device *dev, 
-     u32             subcmd = wrq->flags;
- 
- 	if (dev->priv_flags == INT_MAIN)
--		pAd = dev->priv;
-+		pAd = dev->ml_priv;
- 	else
- 	{
--		pVirtualAd = dev->priv;
--		pAd = pVirtualAd->RtmpDev->priv;
-+		pVirtualAd = dev->ml_priv;
-+		pAd = pVirtualAd->RtmpDev->ml_priv;
- 	}
- 	pObj = (POS_COOKIE) pAd->OS_Cookie;
- 
+@@ -2117,7 +2209,11 @@ rt_private_show(struct net_device *dev, 
+ 	POS_COOKIE		pObj;
+ 	u32             subcmd = wrq->flags;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+ 	pAd = dev->priv;
++#else
++	pAd = dev->ml_priv;
++#endif
  	if (pAd == NULL)
  	{
  		/* if 1st open fail, pAd will be free;
--		   So the net_dev->priv will be NULL in 2rd open */
-+		   So the net_dev->ml_priv will be NULL in 2rd open */
- 		return -ENETDOWN;
- 	}
- 
-@@ -2164,7 +2164,7 @@ int rt_ioctl_siwmlme(struct net_device *
+@@ -2269,7 +2365,11 @@ int rt_ioctl_siwmlme(struct net_device *
  			   union iwreq_data *wrqu,
  			   char *extra)
  {
--	PRTMP_ADAPTER   pAd = (PRTMP_ADAPTER) dev->priv;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+ 	PRTMP_ADAPTER   pAd = (PRTMP_ADAPTER) dev->priv;
++#else
 +	PRTMP_ADAPTER   pAd = (PRTMP_ADAPTER) dev->ml_priv;
++#endif
  	struct iw_mlme *pMlme = (struct iw_mlme *)wrqu->data.pointer;
  	MLME_QUEUE_ELEM				MsgElem;
  	MLME_DISASSOC_REQ_STRUCT	DisAssocReq;
-@@ -2221,7 +2221,7 @@ int rt_ioctl_siwauth(struct net_device *
+@@ -2326,7 +2426,11 @@ int rt_ioctl_siwauth(struct net_device *
  			  struct iw_request_info *info,
  			  union iwreq_data *wrqu, char *extra)
  {
--	PRTMP_ADAPTER   pAdapter = (PRTMP_ADAPTER) dev->priv;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+ 	PRTMP_ADAPTER   pAdapter = (PRTMP_ADAPTER) dev->priv;
++#else
 +	PRTMP_ADAPTER   pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
++#endif
  	struct iw_param *param = &wrqu->param;
  
      //check if the interface is down
-@@ -2374,7 +2374,7 @@ int rt_ioctl_giwauth(struct net_device *
+@@ -2479,7 +2583,11 @@ int rt_ioctl_giwauth(struct net_device *
  			       struct iw_request_info *info,
  			       union iwreq_data *wrqu, char *extra)
  {
--	PRTMP_ADAPTER   pAdapter = (PRTMP_ADAPTER) dev->priv;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+ 	PRTMP_ADAPTER   pAdapter = (PRTMP_ADAPTER) dev->priv;
++#else
 +	PRTMP_ADAPTER   pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
++#endif
  	struct iw_param *param = &wrqu->param;
  
      //check if the interface is down
-@@ -2448,7 +2448,7 @@ int rt_ioctl_siwencodeext(struct net_dev
+@@ -2553,7 +2661,11 @@ int rt_ioctl_siwencodeext(struct net_dev
  			   union iwreq_data *wrqu,
  			   char *extra)
  			{
--    PRTMP_ADAPTER   pAdapter = (PRTMP_ADAPTER) dev->priv;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+     PRTMP_ADAPTER   pAdapter = (PRTMP_ADAPTER) dev->priv;
++#else
 +    PRTMP_ADAPTER   pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
++#endif
  	struct iw_point *encoding = &wrqu->encoding;
  	struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;
      int keyIdx, alg = ext->alg;
-@@ -2561,7 +2561,7 @@ rt_ioctl_giwencodeext(struct net_device 
+@@ -2682,7 +2794,11 @@ rt_ioctl_giwencodeext(struct net_device 
  			  struct iw_request_info *info,
  			  union iwreq_data *wrqu, char *extra)
  {
--	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->priv;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+ 	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->priv;
++#else
 +	PRTMP_ADAPTER pAd = (PRTMP_ADAPTER) dev->ml_priv;
++#endif
  	PCHAR pKey = NULL;
  	struct iw_point *encoding = &wrqu->encoding;
  	struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;
-@@ -2645,7 +2645,7 @@ int rt_ioctl_siwgenie(struct net_device 
+@@ -2766,7 +2882,11 @@ int rt_ioctl_siwgenie(struct net_device 
  			  struct iw_request_info *info,
  			  union iwreq_data *wrqu, char *extra)
  {
--	PRTMP_ADAPTER   pAd = (PRTMP_ADAPTER) dev->priv;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+ 	PRTMP_ADAPTER   pAd = (PRTMP_ADAPTER) dev->priv;
++#else
 +	PRTMP_ADAPTER   pAd = (PRTMP_ADAPTER) dev->ml_priv;
++#endif
  	
- 	if (wrqu->data.length > MAX_LEN_OF_RSNIE ||
- 	    (wrqu->data.length && extra == NULL))
-@@ -2670,7 +2670,7 @@ int rt_ioctl_giwgenie(struct net_device 
+ 	DBGPRINT(RT_DEBUG_TRACE ,("===> rt_ioctl_siwgenie\n"));
+ #ifdef NATIVE_WPA_SUPPLICANT_SUPPORT
+@@ -2798,7 +2918,11 @@ int rt_ioctl_giwgenie(struct net_device 
  			       struct iw_request_info *info,
  			       union iwreq_data *wrqu, char *extra)
  {
--	PRTMP_ADAPTER   pAd = (PRTMP_ADAPTER) dev->priv;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+ 	PRTMP_ADAPTER   pAd = (PRTMP_ADAPTER) dev->priv;
++#else
 +	PRTMP_ADAPTER   pAd = (PRTMP_ADAPTER) dev->ml_priv;
++#endif
  	
  	if ((pAd->StaCfg.RSNIE_Len == 0) ||
  		(pAd->StaCfg.AuthMode < Ndis802_11AuthModeWPA))
-@@ -2716,7 +2716,7 @@ int rt_ioctl_siwpmksa(struct net_device 
+@@ -2844,7 +2968,11 @@ int rt_ioctl_siwpmksa(struct net_device 
  			   union iwreq_data *wrqu,
  			   char *extra)
  {
--	PRTMP_ADAPTER   pAd = (PRTMP_ADAPTER) dev->priv;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+ 	PRTMP_ADAPTER   pAd = (PRTMP_ADAPTER) dev->priv;
++#else
 +	PRTMP_ADAPTER   pAd = (PRTMP_ADAPTER) dev->ml_priv;
++#endif
  	struct iw_pmksa *pPmksa = (struct iw_pmksa *)wrqu->data.pointer;
  	INT	CachedIdx = 0, idx = 0;
  
-@@ -2800,7 +2800,7 @@ rt_private_ioctl_bbp(struct net_device *
+@@ -2928,7 +3056,11 @@ rt_private_ioctl_bbp(struct net_device *
  	UINT32				bbpValue;
  	BOOLEAN				bIsPrintAllBBP = FALSE;
  	INT					Status = 0;
--    PRTMP_ADAPTER       pAdapter = (PRTMP_ADAPTER) dev->priv;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+     PRTMP_ADAPTER       pAdapter = (PRTMP_ADAPTER) dev->priv;
++#else
 +    PRTMP_ADAPTER       pAdapter = (PRTMP_ADAPTER) dev->ml_priv;
++#endif
  
  
  	memset(extra, 0x00, IW_PRIV_SIZE_MASK);
-@@ -2945,7 +2945,7 @@ int rt_ioctl_siwrate(struct net_device *
+@@ -3055,7 +3187,11 @@ int rt_ioctl_siwrate(struct net_device *
  			struct iw_request_info *info,
  			union iwreq_data *wrqu, char *extra)
  {
--    PRTMP_ADAPTER   pAd = (PRTMP_ADAPTER) dev->priv;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+     PRTMP_ADAPTER   pAd = (PRTMP_ADAPTER) dev->priv;
++#else
 +    PRTMP_ADAPTER   pAd = (PRTMP_ADAPTER) dev->ml_priv;
++#endif
      UINT32          rate = wrqu->bitrate.value, fixed = wrqu->bitrate.fixed;
  
      //check if the interface is down
-@@ -3003,7 +3003,7 @@ int rt_ioctl_giwrate(struct net_device *
+@@ -3113,7 +3249,11 @@ int rt_ioctl_giwrate(struct net_device *
  			       struct iw_request_info *info,
  			       union iwreq_data *wrqu, char *extra)
  {
--    PRTMP_ADAPTER   pAd = (PRTMP_ADAPTER) dev->priv;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+     PRTMP_ADAPTER   pAd = (PRTMP_ADAPTER) dev->priv;
++#else
 +    PRTMP_ADAPTER   pAd = (PRTMP_ADAPTER) dev->ml_priv;
++#endif
      int rate_index = 0, rate_count = 0;
      HTTRANSMIT_SETTING ht_setting; 
-     __s32 ralinkrate[] =
-@@ -5396,19 +5396,19 @@ INT rt28xx_sta_ioctl(
+ /* Remove to global variable
+@@ -5574,7 +5714,11 @@ INT rt28xx_sta_ioctl(
+ 	USHORT				subcmd;
  
- 	if (net_dev->priv_flags == INT_MAIN)
- 	{
--		pAd = net_dev->priv;
-+		pAd = net_dev->ml_priv;
- 	}
- 	else
- 	{
--		pVirtualAd = net_dev->priv;
--		pAd = pVirtualAd->RtmpDev->priv;
-+		pVirtualAd = net_dev->ml_priv;
-+		pAd = pVirtualAd->RtmpDev->ml_priv;
- 	}
- 	pObj = (POS_COOKIE) pAd->OS_Cookie;
  
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,29)
+ 	pAd = net_dev->priv;
++#else
++	pAd = net_dev->ml_priv;
++#endif
  	if (pAd == NULL)
  	{
  		/* if 1st open fail, pAd will be free;
--		   So the net_dev->priv will be NULL in 2rd open */
-+		   So the net_dev->ml_priv will be NULL in 2rd open */
- 		return -ENETDOWN;
- 	}
- 

rt3070-Makefile.x-fixes.patch:

Index: rt3070-Makefile.x-fixes.patch
===================================================================
RCS file: /cvs/free/rpms/rt3070-kmod/devel/rt3070-Makefile.x-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rt3070-Makefile.x-fixes.patch	22 Feb 2009 16:46:12 -0000	1.1
+++ rt3070-Makefile.x-fixes.patch	23 May 2009 05:18:50 -0000	1.2
@@ -1,17 +1,8 @@
-diff -rupN old/2008_1225_RT3070_Linux_STA_v2.0.1.0/os/linux/Makefile.4 new/2008_1225_RT3070_Linux_STA_v2.0.1.0/os/linux/Makefile.4
---- old/2008_1225_RT3070_Linux_STA_v2.0.1.0/os/linux/Makefile.4	2008-12-25 00:08:02.000000000 -0500
-+++ new/2008_1225_RT3070_Linux_STA_v2.0.1.0/os/linux/Makefile.4	2009-01-15 11:55:44.000000000 -0500
-@@ -2,8 +2,6 @@ include $(RT28xx_DIR)/os/linux/config.mk
- 
- ifeq ($(RT28xx_MODE), STA)
- MOD_NAME = rt$(CHIPSET)sta
--DAT_PATH = /etc/Wireless/RT$(CHIPSET)STA
--DAT_FILE_NAME = RT$(CHIPSET)STA.dat
- endif
- 
- OBJ := $(MOD_NAME).o
-@@ -86,15 +84,12 @@ ifeq ($(RT28xx_MODE),STA)
- endif
+diff -rupN 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/Makefile.4 2009_0302_RT2870_Linux_STA_v2.1.0.0/os/linux/Makefile.4
+--- 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/Makefile.4	2009-03-01 21:54:15.000000000 -0500
++++ 2009_0302_RT2870_Linux_STA_v2.1.0.0/os/linux/Makefile.4	2009-03-25 20:37:41.000000000 -0400
+@@ -94,13 +94,15 @@ clean:
+ 	rm -f $(RT28xx_DIR)/sta/.*.{cmd,flags,d}
  
  install:
 -	rm -rf $(DAT_PATH)
@@ -21,31 +12,23 @@
 -	install -d $(LINUX_SRC_MODULE)
 -	install -m 644 -c $(addsuffix .o,$(MOD_NAME)) $(LINUX_SRC_MODULE)
 -	/sbin/depmod -a ${shell uname -r}
-+	#install -d $(LINUX_SRC_MODULE)
-+	#install -m 644 -c $(addsuffix .o,$(MOD_NAME)) $(LINUX_SRC_MODULE)
++#	rm -rf $(DAT_PATH)
++#	$(shell [ ! -f /etc/Wireless ] && mkdir /etc/Wireless)
++#	mkdir $(DAT_PATH)
++#	cp $(RT28xx_DIR)/$(DAT_FILE_NAME) $(DAT_PATH)/.
++#	install -d $(LINUX_SRC_MODULE)
++#	install -m 644 -c $(addsuffix .o,$(MOD_NAME)) $(LINUX_SRC_MODULE)
++#	/sbin/depmod -a ${shell uname -r}
 +	mkdir -p $(INST_DIR)
-+	install -d $(INST_DIR)
 +	install -m 644 -c $(addsuffix .ko,$(MOD_NAME))  $(INST_DIR)
-+	#/sbin/depmod -a ${shell uname -r}
  
  uninstall:
--#	rm -rf $(DAT_PATH)
--	rm -rf $(addprefix $(LINUX_SRC_MODULE),$(addsuffix .o,$(MOD_NAME)))
- 	/sbin/depmod -a ${shell uname -r}
-diff -rupN old/2008_1225_RT3070_Linux_STA_v2.0.1.0/os/linux/Makefile.6 new/2008_1225_RT3070_Linux_STA_v2.0.1.0/os/linux/Makefile.6
---- old/2008_1225_RT3070_Linux_STA_v2.0.1.0/os/linux/Makefile.6	2008-12-25 00:20:22.000000000 -0500
-+++ new/2008_1225_RT3070_Linux_STA_v2.0.1.0/os/linux/Makefile.6	2009-01-15 11:55:44.000000000 -0500
-@@ -2,8 +2,6 @@ include $(RT28xx_DIR)/os/linux/config.mk
- 
- ifeq ($(RT28xx_MODE), STA)
- MOD_NAME = rt$(CHIPSET)sta
--DAT_PATH = /etc/Wireless/RT$(CHIPSET)STA
--DAT_FILE_NAME = RT$(CHIPSET)STA.dat
- endif
- 
- obj-m := $(MOD_NAME).o
-@@ -78,15 +76,12 @@ ifeq ($(RT28xx_MODE),STA)
- endif
+ #	rm -rf $(DAT_PATH)
+diff -rupN 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/Makefile.6 2009_0302_RT2870_Linux_STA_v2.1.0.0/os/linux/Makefile.6
+--- 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/Makefile.6	2009-03-01 21:54:24.000000000 -0500
++++ 2009_0302_RT2870_Linux_STA_v2.1.0.0/os/linux/Makefile.6	2009-03-25 20:38:49.000000000 -0400
+@@ -89,13 +89,15 @@ clean:
+ 	rm -f ../../sta/.*.{cmd,flags,d}
  
  install:
 -	rm -rf $(DAT_PATH)
@@ -55,13 +38,15 @@
 -	install -d $(LINUX_SRC_MODULE)
 -	install -m 644 -c $(addsuffix .ko,$(MOD_NAME)) $(LINUX_SRC_MODULE)
 -	/sbin/depmod -a ${shell uname -r}
++#	rm -rf $(DAT_PATH)
++#	$(shell [ ! -f /etc/Wireless ] && mkdir /etc/Wireless)
++#	mkdir $(DAT_PATH)
++#	cp $(RT28xx_DIR)/$(DAT_FILE_NAME) $(DAT_PATH)/.
++#	install -d $(LINUX_SRC_MODULE)
++#	install -m 644 -c $(addsuffix .ko,$(MOD_NAME)) $(LINUX_SRC_MODULE)
++#	/sbin/depmod -a ${shell uname -r}
 +	mkdir -p $(INST_DIR)
-+	install -d $(INST_DIR)
-+	#install -m 644 -c $(addsuffix .ko,$(MOD_NAME)) $(LINUX_SRC_MODULE)
 +	install -m 644 -c $(addsuffix .ko,$(MOD_NAME))  $(INST_DIR)
-+	#/sbin/depmod -a ${shell uname -r}
  
  uninstall:
--#	rm -rf $(DAT_PATH)
- 	rm -rf $(addprefix $(LINUX_SRC_MODULE),$(addsuffix .ko,$(MOD_NAME)))
- 	/sbin/depmod -a ${shell uname -r}
+ #	rm -rf $(DAT_PATH)

rt3070-NetworkManager-support.patch:

Index: rt3070-NetworkManager-support.patch
===================================================================
RCS file: /cvs/free/rpms/rt3070-kmod/devel/rt3070-NetworkManager-support.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rt3070-NetworkManager-support.patch	22 Feb 2009 16:46:12 -0000	1.1
+++ rt3070-NetworkManager-support.patch	23 May 2009 05:18:50 -0000	1.2
@@ -1,6 +1,6 @@
---- old/2008_1225_RT3070_Linux_STA_v2.0.1.0/os/linux/config.mk	2008-12-25 00:21:24.000000000 -0500
-+++ new/2008_1225_RT3070_Linux_STA_v2.0.1.0/os/linux/config.mk	2009-01-15 11:05:03.000000000 -0500
-@@ -17,12 +17,12 @@ HAS_WDS=n
+--- 2009_0302_RT2870_Linux_STA_v2.1.0.0.old/os/linux/config.mk	2009-03-10 00:47:50.000000000 -0400
++++ 2009_0302_RT2870_Linux_STA_v2.1.0.0/os/linux/config.mk	2009-03-25 20:40:49.000000000 -0400
+@@ -6,12 +6,12 @@ HAS_28xx_QA=n
  
  #ifdef WPA_SUPPLICANT_SUPPORT
  # Support Wpa_Supplicant


Index: rt3070-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/rt3070-kmod/devel/rt3070-kmod.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rt3070-kmod.spec	21 May 2009 06:45:39 -0000	1.10
+++ rt3070-kmod.spec	23 May 2009 05:18:50 -0000	1.11
@@ -3,20 +3,20 @@
 # "buildforkernels newest" macro for just that build; immediately after
 # queuing that build enable the macro again for subsequent builds; that way
 # a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+#%%define buildforkernels newest
 
 Name:		rt3070-kmod
-Version:	2.0.1.0
-Release:	3%{?dist}.6
+Version:	2.1.1.0
+Release:	1%{?dist}
 Summary:	Kernel module for wireless devices with Ralink's rt307x chipsets
 
 Group:		System Environment/Kernel
 License:	GPLv2+
 URL:		http://www.ralinktech.com/ralink/Home/Support/Linux.html
-Source0:	http://www.ralinktech.com.tw/data/drivers/2008_1225_RT3070_Linux_STA_v2.0.1.0.tar.bz2
+Source0:	http://www.ralinktech.com.tw/data/drivers/2009_0520_RT3070_Linux_STA_v%{version}.tar.gz
 Source11:	rt3070-kmodtool-excludekernel-filterfile
 
-Patch1:		rt3070-2.6.25-iwe_stream-fix.patch
+Patch1:		rt3070-no2.4-in-kernelversion.patch
 Patch2:		rt3070-Makefile.x-fixes.patch
 Patch3:		rt3070-NetworkManager-support.patch
 Patch4:		rt3070-strip-tftpboot-copy.patch
@@ -26,7 +26,7 @@
 BuildRequires:	%{_bindir}/kmodtool
 
 # needed for plague to make sure it builds for i586 and i686
-ExclusiveArch:  i586 i686 x86_64 ppc ppc64
+ExclusiveArch:	i586 i686 x86_64 ppc ppc64
 
 %{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }
 
@@ -35,8 +35,8 @@
 
 %description
 This package contains the documentation and configuration files for the Ralink
-Driver for WiFi, a linux device driver for 802.11a/b/g universal NIC cards - 
-either PCI, PCIe or MiniPCI - that use Ralink rt307x chipsets.
+Driver for WiFi, a linux device driver for USB 802.11a/b/g universal NIC cards
+that use Ralink rt307x chipsets.
 
 %prep
 %{?kmodtool_check}
@@ -45,24 +45,32 @@
 kmodtool --target %{_target_cpu}  --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
 
 %setup -q -c -T -a 0
-
-%patch1 -p1 -b .iwestream
+pushd *RT3070*Linux*STA*
+find . -type d -exec chmod 755 {} \;
+%patch1 -p1 -b .no24
 %patch2 -p1 -b .rpmbuild
 %patch3 -p1 -b .NetworkManager
 %patch4 -p1 -b .tftpboot
+popd
+
+# Fix permissions
+for ext in c h; do
+ find  . -name "*.$ext" -exec chmod -x '{}' \;
+done
 
 # To avoid possible conflict with rt2870 driver:
-for sta in */include/rt_linux.h */README_STA ; do
+for sta in */include/os/rt_linux.h */os/linux/Makefile.6 */README_STA* */RT2870STACard.dat ; do
  sed 's|RT2870STA|RT3070STA|g' $sta > tmp.sta
  touch -r $sta tmp.sta
  mv tmp.sta $sta
 done
 
 for kernel_version in %{?kernel_versions} ; do
- cp -a *RT3070_Linux_STA* _kmod_build_${kernel_version%%___*}
+ cp -a *RT3070*Linux*STA* _kmod_build_${kernel_version%%___*}
  pushd _kmod_build_${kernel_version%%___*}
   if [[ $kernel_version > "2.6.29" ]]; then
-%patch5 -p2 -b .2.6.29
+# There are still build errors that need to be corrected
+%patch5 -p1 -b .2.6.29
   fi
  popd
 done
@@ -85,6 +93,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Sat May 23 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 2.1.1.0-1
+- update to 2.1.1.0
+
 * Thu May 21 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.0.1.0-3.6
 - rebuild for new kernels
 

rt3070-strip-tftpboot-copy.patch:

Index: rt3070-strip-tftpboot-copy.patch
===================================================================
RCS file: /cvs/free/rpms/rt3070-kmod/devel/rt3070-strip-tftpboot-copy.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rt3070-strip-tftpboot-copy.patch	22 Feb 2009 16:46:12 -0000	1.1
+++ rt3070-strip-tftpboot-copy.patch	23 May 2009 05:18:50 -0000	1.2
@@ -1,14 +1,51 @@
---- old/2008_1225_RT3070_Linux_STA_v2.0.1.0/Makefile	2008-12-25 00:19:38.000000000 -0500
-+++ new/2008_1225_RT3070_Linux_STA_v2.0.1.0/Makefile	2009-01-15 11:07:18.000000000 -0500
-@@ -129,11 +129,9 @@ LINUX:
- ifneq (,$(findstring 2.4,$(LINUX_SRC)))
- 	cp -f os/linux/Makefile.4 $(RT28xx_DIR)/os/linux/Makefile
- 	make -C $(RT28xx_DIR)/os/linux/
+diff -rupN 2009_0520_RT3070_Linux_STA_v2.1.1.0.old/Makefile 2009_0520_RT3070_Linux_STA_v2.1.1.0/Makefile
+--- 2009_0520_RT3070_Linux_STA_v2.1.1.0.old/Makefile	2009-05-20 21:58:28.000000000 -0400
++++ 2009_0520_RT3070_Linux_STA_v2.1.1.0/Makefile	2009-05-22 17:30:47.000000000 -0400
+@@ -146,47 +146,28 @@ UCOS:
+ 
+ 
+ LINUX:
+-ifneq (,$(findstring 2.4,$(LINUX_SRC)))
+-	cp -f os/linux/Makefile.4 $(RT28xx_DIR)/os/linux/Makefile
+-	make -C $(RT28xx_DIR)/os/linux/
 -	cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.o /tftpboot
- else
+-else
  	cp -f os/linux/Makefile.6 $(RT28xx_DIR)/os/linux/Makefile
  	make  -C  $(LINUX_SRC) SUBDIRS=$(RT28xx_DIR)/os/linux modules
 -	cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot
+-endif	
+ 
+ clean:
+ ifeq ($(TARGET), LINUX)
+-ifneq (,$(findstring 2.4,$(LINUX_SRC)))
+-	cp -f os/linux/Makefile.4 os/linux/Makefile
+-else
+ 	cp -f os/linux/Makefile.6 os/linux/Makefile
+ endif
+ 	make -C os/linux clean
+ 	rm -rf os/linux/Makefile
+-endif	
+ ifeq ($(TARGET), UCOS)
+ 	make -C os/ucos clean MODE=$(RT28xx_MODE)
+ endif
+ 
+ uninstall:
+ ifeq ($(TARGET), LINUX)
+-ifneq (,$(findstring 2.4,$(LINUX_SRC)))
+-	make -C $(RT28xx_DIR)/os/linux -f Makefile.4 uninstall
+-else
+ 	make -C $(RT28xx_DIR)/os/linux -f Makefile.6 uninstall
+ endif
+-endif
+ 
+ install:
+ ifeq ($(TARGET), LINUX)
+-ifneq (,$(findstring 2.4,$(LINUX_SRC)))
+-	make -C $(RT28xx_DIR)/os/linux -f Makefile.4 install
+-else
+ 	make -C $(RT28xx_DIR)/os/linux -f Makefile.6 install
  endif
+-endif
  
- release:
+ libwapi:
+ 	make -C $(RT28xx_DIR)/os/linux -f Makefile.libwapi


Index: sources
===================================================================
RCS file: /cvs/free/rpms/rt3070-kmod/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	22 Feb 2009 16:46:12 -0000	1.2
+++ sources	23 May 2009 05:18:50 -0000	1.3
@@ -1 +1 @@
-3d053dd1fbf0380c2f9d0b8552dcdbb2  2008_1225_RT3070_Linux_STA_v2.0.1.0.tar.bz2
+f4823d3b51034d8e655125ac5d133f6b  2009_0520_RT3070_Linux_STA_v2.1.1.0.tar.gz


--- rt3070-2.6.25-iwe_stream-fix.patch DELETED ---

More information about the rpmfusion-commits mailing list