[PATCH] libertas: misc cleanups in compact-flash code

[PATCH] libertas: misc cleanups in compact-flash code

[Holger Schurig]

Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>

Index: wireless-2.6/drivers/net/wireless/libertas/if_cs.c
===================================================================
--- wireless-2.6.orig/drivers/net/wireless/libertas/if_cs.c	2008-01-25 13:57:44.000000000 +0100
+++ wireless-2.6/drivers/net/wireless/libertas/if_cs.c	2008-01-25 13:58:30.000000000 +0100
@@ -396,11 +396,9 @@ static struct sk_buff *if_cs_receive_dat
 	if (len == 0 || len > MRVDRV_ETH_RX_PACKET_BUFFER_SIZE) {
 		lbs_pr_err("card data buffer has invalid # of bytes (%d)\n", len);
 		priv->stats.rx_dropped++;
-		printk(KERN_INFO "##HS %s:%d TODO\n", __FUNCTION__, __LINE__);
 		goto dat_err;
 	}
 
-	//TODO: skb = dev_alloc_skb(len+ETH_FRAME_LEN+MRVDRV_SNAP_HEADER_LEN+EXTRA_LEN);
 	skb = dev_alloc_skb(MRVDRV_ETH_RX_PACKET_BUFFER_SIZE + 2);
 	if (!skb)
 		goto out;
@@ -912,6 +910,7 @@ static void if_cs_detach(struct pcmcia_d
 	if_cs_disable_ints(card);
 	if_cs_release(p_dev);
 	kfree(card);
+	card = NULL;
 
 	lbs_deb_leave(LBS_DEB_CS);
 }

Re: [PATCH] libertas: misc cleanups in compact-flash code

[Dan Williams]

On Mon, 2008-01-28 at 17:24 +0100, Holger Schurig wrote:
> Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
> 
> Index: wireless-2.6/drivers/net/wireless/libertas/if_cs.c
> ===================================================================
> --- wireless-2.6.orig/drivers/net/wireless/libertas/if_cs.c	2008-01-25 13:57:44.000000000 +0100
> +++ wireless-2.6/drivers/net/wireless/libertas/if_cs.c	2008-01-25 13:58:30.000000000 +0100
> @@ -396,11 +396,9 @@ static struct sk_buff *if_cs_receive_dat
>  	if (len == 0 || len > MRVDRV_ETH_RX_PACKET_BUFFER_SIZE) {
>  		lbs_pr_err("card data buffer has invalid # of bytes (%d)\n", len);
>  		priv->stats.rx_dropped++;
> -		printk(KERN_INFO "##HS %s:%d TODO\n", __FUNCTION__, __LINE__);
>  		goto dat_err;
>  	}
>  
> -	//TODO: skb = dev_alloc_skb(len+ETH_FRAME_LEN+MRVDRV_SNAP_HEADER_LEN+EXTRA_LEN);
>  	skb = dev_alloc_skb(MRVDRV_ETH_RX_PACKET_BUFFER_SIZE + 2);
>  	if (!skb)
>  		goto out;
> @@ -912,6 +910,7 @@ static void if_cs_detach(struct pcmcia_d
>  	if_cs_disable_ints(card);
>  	if_cs_release(p_dev);
>  	kfree(card);
> +	card = NULL;

This seems kind of pointless; card is a local variable and isn't used
anywhere after this.

Dan
 
>  	lbs_deb_leave(LBS_DEB_CS);
>  }

Re: [PATCH] libertas: misc cleanups in compact-flash code

[Holger Schurig]

> This seems kind of pointless; card is a local variable and
> isn't used anywhere after this.

Okay. I put this code in (without too much thinking) when I
chased the IRQ-at-card-removal error.

Drop the patch. When I change something else in if_cs.c, I'll
remove the TODO strings.