linux-kernel - Re: [PATCH 7/7] w35und: remove ->shutdown from struct wbsoft

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Thu, 30 Oct 2008 20:20:36 +0100
From:	Pavel Machek <pavel@...e.cz>
To:	Pekka Enberg <penberg@...helsinki.fi>
Cc:	greg@...ah.com, linux-kernel@...r.kernel.org
Subject: Re: [PATCH 7/7] w35und: remove ->shutdown from struct wbsoft_priv

On Thu 2008-10-30 18:12:07, Pekka Enberg wrote:
> It's not actually used for anything, so remove it.

Acked-by: Pavel Machek <pavel@...e.cz>

> Signed-off-by: Pekka Enberg <penberg@...helsinki.fi>
> ---
>  drivers/staging/winbond/Makefile    |    1 -
>  drivers/staging/winbond/core.h      |    1 -
>  drivers/staging/winbond/wbhal.c     |    1 -
>  drivers/staging/winbond/wblinux.c   |   31 -------------------------------
>  drivers/staging/winbond/wblinux_f.h |    2 --
>  drivers/staging/winbond/wbusb.c     |    6 +-----
>  6 files changed, 1 insertions(+), 41 deletions(-)
>  delete mode 100644 drivers/staging/winbond/wblinux.c
>  delete mode 100644 drivers/staging/winbond/wblinux_s.h
> 
> diff --git a/drivers/staging/winbond/Makefile b/drivers/staging/winbond/Makefile
> index a93732e..d337571 100644
> --- a/drivers/staging/winbond/Makefile
> +++ b/drivers/staging/winbond/Makefile
> @@ -9,7 +9,6 @@ w35und-objs :=			\
>  	wb35rx.o		\
>  	wb35tx.o		\
>  	wbhal.o			\
> -	wblinux.o		\
>  	wbusb.o			\
>  
>  
> diff --git a/drivers/staging/winbond/core.h b/drivers/staging/winbond/core.h
> index 9c9d5d2..fe142a1 100644
> --- a/drivers/staging/winbond/core.h
> +++ b/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/drivers/staging/winbond/wbhal.c b/drivers/staging/winbond/wbhal.c
> index d2be5fb..7ab5300 100644
> --- a/drivers/staging/winbond/wbhal.c
> +++ b/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/drivers/staging/winbond/wblinux.c b/drivers/staging/winbond/wblinux.c
> deleted file mode 100644
> index 0461516..0000000
> --- a/drivers/staging/winbond/wblinux.c
> +++ /dev/null
> @@ -1,31 +0,0 @@
> -//============================================================================
> -//  Copyright (c) 1996-2005 Winbond Electronic Corporation
> -//
> -//  Module Name:
> -//    wblinux.c
> -//
> -//  Abstract:
> -//    Linux releated routines
> -//
> -//============================================================================
> -#include <linux/netdevice.h>
> -
> -#include "mds_f.h"
> -#include "mto_f.h"
> -#include "sysdef.h"
> -#include "wbhal_f.h"
> -#include "wblinux_f.h"
> -
> -void
> -WBLINUX_stop(  struct wbsoft_priv * adapter )
> -{
> -	if (atomic_inc_return(&adapter->ThreadCount) == 1) {
> -		// Shutdown module immediately
> -		adapter->shutdown = 1;
> -#ifdef _PE_STATE_DUMP_
> -		WBDEBUG(( "[w35und] SKB_RELEASE OK\n" ));
> -#endif
> -	}
> -
> -	atomic_dec(&adapter->ThreadCount);
> -}
> diff --git a/drivers/staging/winbond/wblinux_f.h b/drivers/staging/winbond/wblinux_f.h
> index f531a01..868e877 100644
> --- a/drivers/staging/winbond/wblinux_f.h
> +++ b/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/drivers/staging/winbond/wblinux_s.h b/drivers/staging/winbond/wblinux_s.h
> deleted file mode 100644
> index e69de29..0000000
> diff --git a/drivers/staging/winbond/wbusb.c b/drivers/staging/winbond/wbusb.c
> index b981662..cb4dee5 100644
> --- a/drivers/staging/winbond/wbusb.c
> +++ b/drivers/staging/winbond/wbusb.c
> @@ -302,8 +302,7 @@ error:
>  	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);
>  }

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/