[patch 1/2] btsdio: free sk_buff with kfree_skb

[patch 1/2] btsdio: free sk_buff with kfree_skb

[Sergio Luis]

free sk_buff with kfree_skb, instead of kree
 
Signed-off-by: Sergio Luis <sergio@larces.uece.br>
Cc: Marcel Holtmann <marcel@holtmann.org>

drivers/bluetooth/btsdio.c         |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/bluetooth/btsdio.c b/drivers/bluetooth/btsdio.c
index 58630cc..cda6c7c 100644
--- a/drivers/bluetooth/btsdio.c
+++ b/drivers/bluetooth/btsdio.c
@@ -152,7 +152,7 @@ static int btsdio_rx_packet(struct btsdio_data *data)
 
 	err = sdio_readsb(data->func, skb->data, REG_RDAT, len - 4);
 	if (err < 0) {
-		kfree(skb);
+		kfree_skb(skb);
 		return err;
 	}
 

Re: [patch 1/2] btsdio: free sk_buff with kfree_skb

[David Miller]

From: Sergio Luis <sergio@larces.uece.br>
Date: Sun, 26 Oct 2008 04:16:29 -0300

> free sk_buff with kfree_skb, instead of kree
>  
> Signed-off-by: Sergio Luis <sergio@larces.uece.br>

Since this is pretty obvious I'm applying this directly, I hope
Marcel doesn't mind :-)

Re: [patch 1/2] btsdio: free sk_buff with kfree_skb

[Marcel Holtmann]

Hi Dave,

> > free sk_buff with kfree_skb, instead of kree
> >  
> > Signed-off-by: Sergio Luis <sergio@larces.uece.br>
> 
> Since this is pretty obvious I'm applying this directly, I hope
> Marcel doesn't mind :-)

that is fine with me. No need to run this through me.

Regards

Marcel

[PATCH 0/2] btsdio fixes on error path

[Tomas Winkler]

Please add btsdio fixes for error path to stable release.  Some sdio devices are not so stable so we are hitting this often and it leaves kernel in bad state.
Bluetooth: Fix TX error path in btsdio driver -  is needed for 2.6.27 and 2.6.28 kernel
btsdio: free sk_buff with kfree_skb  - is needed for 2.6.27 kernel


Commit messages as appears upstream:

commit 7644d63d1348ec044ccd8f775fefe5eb7cbcac69
Author: Tomas Winkler <tomas.winkler@intel.com>
Date:   Sun Nov 30 12:17:18 2008 +0100
 
    Bluetooth: Fix TX error path in btsdio driver
    
    This patch fixes accumulating of the header in case packet was requeued
    in the error path.
    
    Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
    Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
 
commit cbfd24a75f98fe731547d3bc995f3a1f1fed6b20
Author: Sergio Luis <sergio@larces.uece.br>
Date:   Sun Oct 26 23:08:48 2008 -0700
 
    btsdio: free sk_buff with kfree_skb
    
    free sk_buff with kfree_skb, instead of kree
    
    Signed-off-by: Sergio Luis <sergio@larces.uece.br>
    Signed-off-by: David S. Miller <davem@davemloft.net>



---------------------------------------------------------------------
Intel Israel (74) Limited

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.

[PATCH 1/2] btsdio: free sk_buff with kfree_skb

[Tomas Winkler]

From: Sergio Luis <sergio@larces.uece.br>

free sk_buff with kfree_skb, instead of kree

Signed-off-by: Sergio Luis <sergio@larces.uece.br>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
 drivers/bluetooth/btsdio.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/bluetooth/btsdio.c b/drivers/bluetooth/btsdio.c
index 58630cc..cda6c7c 100644
--- a/drivers/bluetooth/btsdio.c
+++ b/drivers/bluetooth/btsdio.c
@@ -152,7 +152,7 @@ static int btsdio_rx_packet(struct btsdio_data *data)
 
 	err = sdio_readsb(data->func, skb->data, REG_RDAT, len - 4);
 	if (err < 0) {
-		kfree(skb);
+		kfree_skb(skb);
 		return err;
 	}
 
-- 
1.6.0.6

---------------------------------------------------------------------
Intel Israel (74) Limited

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.

[PATCH 2/2] Bluetooth: Fix TX error path in btsdio driver

[Tomas Winkler]

This patch fixes accumulating of the header in case packet was requeued
in the error path.

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
---
 drivers/bluetooth/btsdio.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/bluetooth/btsdio.c b/drivers/bluetooth/btsdio.c
index cda6c7c..f2ada0c 100644
--- a/drivers/bluetooth/btsdio.c
+++ b/drivers/bluetooth/btsdio.c
@@ -91,6 +91,7 @@ static int btsdio_tx_packet(struct btsdio_data *data, struct sk_buff *skb)
 
 	err = sdio_writesb(data->func, REG_TDAT, skb->data, skb->len);
 	if (err < 0) {
+		skb_pull(skb, 4);
 		sdio_writeb(data->func, 0x01, REG_PC_WRT, NULL);
 		return err;
 	}
-- 
1.6.0.6

---------------------------------------------------------------------
Intel Israel (74) Limited

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.