---

yaml --- r: 162536 b: refs/heads/master c: 5e1ad18 h: refs/heads/master v: v3
git-mirror · Sep 15, 2009 · 8313069 · 8313069
1 parent 40003c9
commit 8313069
Show file tree

Hide file tree

Showing 10 changed files with 146 additions and 172 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ecdfa44610fa18678c3dd481af75368b9800c6c7
+refs/heads/master: 5e1ad18a8d198ccb0e201cb444a58f7e277dfb4d
diff --git a/trunk/drivers/staging/rtl8192e/r8180_93cx6.c b/trunk/drivers/staging/rtl8192e/r8180_93cx6.c
@@ -20,7 +20,7 @@
 
 #include "r8180_93cx6.h"
 
-void eprom_cs(struct net_device *dev, short bit)
+static void eprom_cs(struct net_device *dev, short bit)
 {
 	if(bit)
 		write_nic_byte(dev, EPROM_CMD,
@@ -35,7 +35,7 @@ void eprom_cs(struct net_device *dev, short bit)
 }
 
 
-void eprom_ck_cycle(struct net_device *dev)
+static void eprom_ck_cycle(struct net_device *dev)
 {
 	write_nic_byte(dev, EPROM_CMD,
 		       (1<<EPROM_CK_SHIFT) | read_nic_byte(dev,EPROM_CMD));
@@ -48,7 +48,7 @@ void eprom_ck_cycle(struct net_device *dev)
 }
 
 
-void eprom_w(struct net_device *dev,short bit)
+static void eprom_w(struct net_device *dev,short bit)
 {
 	if(bit)
 		write_nic_byte(dev, EPROM_CMD, (1<<EPROM_W_SHIFT) | \
@@ -62,7 +62,7 @@ void eprom_w(struct net_device *dev,short bit)
 }
 
 
-short eprom_r(struct net_device *dev)
+static short eprom_r(struct net_device *dev)
 {
 	short bit;
 
@@ -74,7 +74,7 @@ short eprom_r(struct net_device *dev)
 }
 
 
-void eprom_send_bits_string(struct net_device *dev, short b[], int len)
+static void eprom_send_bits_string(struct net_device *dev, short b[], int len)
 {
 	int i;
 

diff --git a/trunk/drivers/staging/rtl8192e/r8190_rtl8256.c b/trunk/drivers/staging/rtl8192e/r8190_rtl8256.c
@@ -418,7 +418,7 @@ void PHY_SetRF8256OFDMTxPower(struct net_device* dev, u8 powerlevel)
 }
 
 #define MAX_DOZE_WAITING_TIMES_9x 64
-bool
+static bool
 SetRFPowerState8190(
 	struct net_device* dev,
 	RT_RF_POWER_STATE	eRFPowerState
@@ -717,7 +717,7 @@ SetRFPowerState8190(
 //
 //	050823, by rcnjko.
 //
-bool
+static bool
 SetRFPowerState(
 	struct net_device* dev,
 	RT_RF_POWER_STATE	eRFPowerState
@@ -745,7 +745,7 @@ SetRFPowerState(
 	return bResult;
 }
 
-void
+static void
 MgntDisconnectIBSS(
 	struct net_device* dev
 )
@@ -823,7 +823,7 @@ MgntDisconnectIBSS(
 
 }
 
-void
+static void
 MlmeDisassociateRequest(
 	struct net_device* dev,
 	u8* 		asSta,
@@ -837,7 +837,7 @@ MlmeDisassociateRequest(
 
 	SendDisassociation( priv->ieee80211, asSta, asRsn );
 
-	if(memcpy(priv->ieee80211->current_network.bssid,asSta,6) == 0)
+	if(memcpy(priv->ieee80211->current_network.bssid,asSta,6) == NULL)
 	{
 		//ShuChen TODO: change media status.
 		//ShuChen TODO: What to do when disassociate.
@@ -891,7 +891,7 @@ MlmeDisassociateRequest(
 }
 
 
-void
+static void
 MgntDisconnectAP(
 	struct net_device* dev,
 	u8 asRsn
@@ -945,7 +945,7 @@ MgntDisconnectAP(
 }
 
 
-bool
+static bool
 MgntDisconnect(
 	struct net_device* dev,
 	u8 asRsn