---

yaml --- r: 126583 b: refs/heads/master c: 54369cc h: refs/heads/master i: 126581: bce8a6d 126579: 88711da 126575: bc847b0 v: v3
git-mirror · Jan 6, 2009 · 575ce0f · 575ce0f
1 parent 9560a89
commit 575ce0f
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 42 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72e202d00ef1ca9134010ff5574f165af6e382fe
+refs/heads/master: 54369cc69c4625e48838b15151a39e643d9b6ad8
diff --git a/trunk/drivers/staging/winbond/Makefile b/trunk/drivers/staging/winbond/Makefile
@@ -9,7 +9,6 @@ w35und-objs :=			\
 	wb35rx.o		\
 	wb35tx.o		\
 	wbhal.o			\
-	wblinux.o		\
 	wbusb.o			\
 
 

diff --git a/trunk/drivers/staging/winbond/core.h b/trunk/drivers/staging/winbond/core.h
@@ -24,7 +24,6 @@ struct wbsoft_priv {
 	MDS Mds;
 
 	spinlock_t SpinLock;
-	u32 shutdown;
 
 	atomic_t ThreadCount;
 

diff --git a/trunk/drivers/staging/winbond/wbhal.c b/trunk/drivers/staging/winbond/wbhal.c
@@ -850,7 +850,6 @@ void hal_surprise_remove(struct wbsoft_priv *adapter)
 		#ifdef _PE_STATE_DUMP_
 		WBDEBUG(("Calling hal_surprise_remove\n"));
 		#endif
-		WBLINUX_stop( adapter );
 	}
 }
 

diff --git a/trunk/drivers/staging/winbond/wblinux.c b/trunk/drivers/staging/winbond/wblinux.c
diff --git a/trunk/drivers/staging/winbond/wblinux_f.h b/trunk/drivers/staging/winbond/wblinux_f.h
@@ -10,9 +10,7 @@
 // wblinux_f.h
 //
 int wb35_start_xmit(struct sk_buff *skb, struct net_device *netdev );
-void WBLINUX_stop(  struct wbsoft_priv *adapter );
 void wb35_set_multicast( struct net_device *netdev );
 struct net_device_stats * wb35_netdev_stats( struct net_device *netdev );
-void WBLINUX_stop(  struct wbsoft_priv *adapter );
 
 #endif
diff --git a/trunk/drivers/staging/winbond/wbusb.c b/trunk/drivers/staging/winbond/wbusb.c
@@ -302,8 +302,7 @@ static unsigned char wb35_hw_init(struct ieee80211_hw *hw)
 	case 4:
 	case 3: Mds_Destroy( priv );
 	case 2:
-	case 1: WBLINUX_stop(priv);
-		hal_halt( pHwData, NULL );
+	case 1: hal_halt( pHwData, NULL );
 	case 0: break;
 	}
 
@@ -402,9 +401,6 @@ static void wb35_hw_halt(struct wbsoft_priv *adapter)
 #endif
 	msleep(100);// Waiting Irp completed
 
-	// Destroy the NDIS module
-	WBLINUX_stop(adapter);
-
 	// Halt the HAL
 	hal_halt(&adapter->sHwData, NULL);
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -850,7 +850,6 @@ void hal_surprise_remove(struct wbsoft_priv *adapter) @@
     		#ifdef _PE_STATE_DUMP_
     		WBDEBUG(("Calling hal_surprise_remove\n"));
     		#endif
-    		WBLINUX_stop( adapter );
     	}
     }
@@ Expand Down @@