[patch] Fixes four problems in the current source

rtl8187_fixes.patch (text/plain), 6.37 KB, created by Christian Holler on 2007-01-20 19:07:14 UTC

diff -Naur rtl8187_linuxdrv_V1.1.orig/beta-8187/r8180_rtl8225.h rtl8187_linuxdrv_V1.1/beta-8187/r8180_rtl8225.h
--- rtl8187_linuxdrv_V1.1.orig/beta-8187/r8180_rtl8225.h	2005-11-08 19:49:46.000000000 +0100
+++ rtl8187_linuxdrv_V1.1/beta-8187/r8180_rtl8225.h	2007-01-20 20:03:16.000000000 +0100
@@ -33,6 +33,7 @@
 void rtl8225_host_usb_init(struct net_device *dev);
 void write_rtl8225(struct net_device *dev, u8 adr, u16 data);
 void rtl8225z2_rf_set_mode(struct net_device *dev) ;
+void rtl8185_rf_pins_enable(struct net_device *dev);
 
 #define RTL8225_RF_MAX_SENS 6
 #define RTL8225_RF_DEF_SENS 4
diff -Naur rtl8187_linuxdrv_V1.1.orig/beta-8187/r8187.h rtl8187_linuxdrv_V1.1/beta-8187/r8187.h
--- rtl8187_linuxdrv_V1.1.orig/beta-8187/r8187.h	2005-11-08 15:10:00.000000000 +0100
+++ rtl8187_linuxdrv_V1.1/beta-8187/r8187.h	2007-01-20 20:03:16.000000000 +0100
@@ -26,7 +26,7 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/config.h>
+
 #include <linux/init.h>
 #include <linux/ioport.h>
 #include <linux/sched.h>
@@ -250,6 +250,7 @@
 typedef enum{ 
 	LOW_PRIORITY ,
 	NORM_PRIORITY 
+	
 	} priority_t;
 
 
@@ -284,4 +285,6 @@
 void write_phy_cck(struct net_device *dev, u8 adr, u32 data);
 void write_phy_ofdm(struct net_device *dev, u8 adr, u32 data);
 void rtl8185_tx_antenna(struct net_device *dev, u8 ant);
+void rtl8187_set_rxconf(struct net_device *dev);
+void rtl8180_set_mode(struct net_device *dev,int mode);
 #endif
diff -Naur rtl8187_linuxdrv_V1.1.orig/beta-8187/r8187_core.c rtl8187_linuxdrv_V1.1/beta-8187/r8187_core.c
--- rtl8187_linuxdrv_V1.1.orig/beta-8187/r8187_core.c	2007-01-20 20:02:50.000000000 +0100
+++ rtl8187_linuxdrv_V1.1/beta-8187/r8187_core.c	2007-01-20 20:03:16.000000000 +0100
@@ -658,7 +658,7 @@
 	write_nic_dword(dev,TX_CONF,tx | (TX_LOOPBACK_NONE<<TX_LOOPBACK_SHIFT));
 #endif
 }
-void rtl8187_rx_isr(struct urb *rx_urb, struct pt_regs *regs);
+void rtl8187_rx_isr(struct urb *rx_urb);
 
 
 void rtl8187_rx_urbsubmit(struct net_device *dev, struct urb* rx_urb)
@@ -1028,7 +1028,7 @@
 }
 		
 
-void rtl8187_rx_isr(struct urb *rx_urb, struct pt_regs *regs)
+void rtl8187_rx_isr(struct urb *rx_urb)
 {
 
 	struct net_device *dev = (struct net_device*)rx_urb->context;
@@ -1267,7 +1267,7 @@
 
 void rtl8180_try_wake_queue(struct net_device *dev, int pri);
 
-void rtl8187_lptx_isr(struct urb *tx_urb, struct pt_regs *regs)
+void rtl8187_lptx_isr(struct urb *tx_urb)
 {
 	struct net_device *dev = (struct net_device*)tx_urb->context;
 	struct r8180_priv *priv = ieee80211_priv(dev);
@@ -1366,7 +1366,7 @@
 	
 }
 
-void rtl8187_nptx_isr(struct urb *tx_urb, struct pt_regs *regs)
+void rtl8187_nptx_isr(struct urb *tx_urb)
 {
 	struct net_device *dev = (struct net_device*)tx_urb->context;
 	struct r8180_priv *priv = ieee80211_priv(dev);
@@ -2382,7 +2382,7 @@
 	dev->do_ioctl = rtl8180_ioctl;
 	dev->set_multicast_list = r8180_set_multicast;
 	dev->set_mac_address = r8180_set_mac_adr;
-	dev->get_wireless_stats = r8180_get_wireless_stats;
+	dev->get_stats = rtl8180_stats;
 	dev->type=ARPHRD_ETHER;
 	
 	if (dev_alloc_name(dev, ifname) < 0){
diff -Naur rtl8187_linuxdrv_V1.1.orig/ieee80211/ieee80211_crypt.c rtl8187_linuxdrv_V1.1/ieee80211/ieee80211_crypt.c
--- rtl8187_linuxdrv_V1.1.orig/ieee80211/ieee80211_crypt.c	2005-06-06 20:57:45.000000000 +0200
+++ rtl8187_linuxdrv_V1.1/ieee80211/ieee80211_crypt.c	2007-01-20 20:03:16.000000000 +0100
@@ -11,7 +11,7 @@
  *
  */
 
-#include <linux/config.h>
+
 #include <linux/version.h>
 #include <linux/module.h>
 #include <linux/init.h>
diff -Naur rtl8187_linuxdrv_V1.1.orig/ieee80211/ieee80211_crypt_ccmp.c rtl8187_linuxdrv_V1.1/ieee80211/ieee80211_crypt_ccmp.c
--- rtl8187_linuxdrv_V1.1.orig/ieee80211/ieee80211_crypt_ccmp.c	2005-10-14 14:02:53.000000000 +0200
+++ rtl8187_linuxdrv_V1.1/ieee80211/ieee80211_crypt_ccmp.c	2007-01-20 20:03:16.000000000 +0100
@@ -9,7 +9,7 @@
  * more details.
  */
 
-#include <linux/config.h>
+
 #include <linux/version.h>
 #include <linux/module.h>
 #include <linux/init.h>
diff -Naur rtl8187_linuxdrv_V1.1.orig/ieee80211/ieee80211_crypt_tkip.c rtl8187_linuxdrv_V1.1/ieee80211/ieee80211_crypt_tkip.c
--- rtl8187_linuxdrv_V1.1.orig/ieee80211/ieee80211_crypt_tkip.c	2005-10-14 14:02:33.000000000 +0200
+++ rtl8187_linuxdrv_V1.1/ieee80211/ieee80211_crypt_tkip.c	2007-01-20 20:03:16.000000000 +0100
@@ -9,7 +9,7 @@
  * more details.
  */
 
-#include <linux/config.h>
+
 #include <linux/version.h>
 #include <linux/module.h>
 #include <linux/init.h>
diff -Naur rtl8187_linuxdrv_V1.1.orig/ieee80211/ieee80211_crypt_wep.c rtl8187_linuxdrv_V1.1/ieee80211/ieee80211_crypt_wep.c
--- rtl8187_linuxdrv_V1.1.orig/ieee80211/ieee80211_crypt_wep.c	2005-06-06 20:57:45.000000000 +0200
+++ rtl8187_linuxdrv_V1.1/ieee80211/ieee80211_crypt_wep.c	2007-01-20 20:03:16.000000000 +0100
@@ -9,7 +9,7 @@
  * more details.
  */
 
-#include <linux/config.h>
+
 #include <linux/version.h>
 #include <linux/module.h>
 #include <linux/init.h>
diff -Naur rtl8187_linuxdrv_V1.1.orig/ieee80211/ieee80211_module.c rtl8187_linuxdrv_V1.1/ieee80211/ieee80211_module.c
--- rtl8187_linuxdrv_V1.1.orig/ieee80211/ieee80211_module.c	2005-10-24 20:35:01.000000000 +0200
+++ rtl8187_linuxdrv_V1.1/ieee80211/ieee80211_module.c	2007-01-20 20:03:16.000000000 +0100
@@ -31,7 +31,7 @@
 *******************************************************************************/
 
 #include <linux/compiler.h>
-#include <linux/config.h>
+
 #include <linux/errno.h>
 #include <linux/if_arp.h>
 #include <linux/in6.h>
diff -Naur rtl8187_linuxdrv_V1.1.orig/ieee80211/ieee80211_rx.c rtl8187_linuxdrv_V1.1/ieee80211/ieee80211_rx.c
--- rtl8187_linuxdrv_V1.1.orig/ieee80211/ieee80211_rx.c	2005-11-14 19:41:15.000000000 +0100
+++ rtl8187_linuxdrv_V1.1/ieee80211/ieee80211_rx.c	2007-01-20 20:03:16.000000000 +0100
@@ -22,7 +22,7 @@
  
 
 #include <linux/compiler.h>
-#include <linux/config.h>
+
 #include <linux/errno.h>
 #include <linux/if_arp.h>
 #include <linux/in6.h>
diff -Naur rtl8187_linuxdrv_V1.1.orig/ieee80211/ieee80211_tx.c rtl8187_linuxdrv_V1.1/ieee80211/ieee80211_tx.c
--- rtl8187_linuxdrv_V1.1.orig/ieee80211/ieee80211_tx.c	2005-10-24 22:23:41.000000000 +0200
+++ rtl8187_linuxdrv_V1.1/ieee80211/ieee80211_tx.c	2007-01-20 20:03:16.000000000 +0100
@@ -32,7 +32,7 @@
 ******************************************************************************/
 
 #include <linux/compiler.h>
-#include <linux/config.h>
+
 #include <linux/errno.h>
 #include <linux/if_arp.h>
 #include <linux/in6.h>