From: Pekka Enberg Date: Thu, 30 Oct 2008 16:12:06 +0000 (+0200) Subject: Staging: w35und: remove ->skb_array from struct wbsoft_priv X-Git-Tag: v2.6.29-rc1~228^2~194 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=72e202d00ef1ca9134010ff5574f165af6e382fe;p=linux-2.6-omap-h63xx.git Staging: w35und: remove ->skb_array from struct wbsoft_priv It's not actually used for anything, so remove it. Acked-by: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/winbond/core.h b/drivers/staging/winbond/core.h index c6dd223e722..9c9d5d29e66 100644 --- a/drivers/staging/winbond/core.h +++ b/drivers/staging/winbond/core.h @@ -31,10 +31,7 @@ struct wbsoft_priv { u32 RxByteCount; u32 TxByteCount; - struct sk_buff *skb_array[WBLINUX_PACKET_ARRAY_SIZE]; struct sk_buff *packet_return; - s32 skb_SetIndex; - s32 skb_GetIndex; s32 netif_state_stop; // 1: stop 0: normal struct iw_statistics iw_stats; diff --git a/drivers/staging/winbond/wblinux.c b/drivers/staging/winbond/wblinux.c index 9b436ac7e63..87db0a830a2 100644 --- a/drivers/staging/winbond/wblinux.c +++ b/drivers/staging/winbond/wblinux.c @@ -19,25 +19,9 @@ void WBLINUX_stop( struct wbsoft_priv * adapter ) { - struct sk_buff *pSkb; - if (atomic_inc_return(&adapter->ThreadCount) == 1) { // Shutdown module immediately adapter->shutdown = 1; - - while (adapter->skb_array[ adapter->skb_GetIndex ]) { - // Trying to free the un-sending packet - pSkb = adapter->skb_array[ adapter->skb_GetIndex ]; - adapter->skb_array[ adapter->skb_GetIndex ] = NULL; - if( in_irq() ) - dev_kfree_skb_irq( pSkb ); - else - dev_kfree_skb( pSkb ); - - adapter->skb_GetIndex++; - adapter->skb_GetIndex %= WBLINUX_PACKET_ARRAY_SIZE; - } - #ifdef _PE_STATE_DUMP_ WBDEBUG(( "[w35und] SKB_RELEASE OK\n" )); #endif