[net 1/3] caif: Clear shutdown mask to zero at reconnect.

[net 1/3] caif: Clear shutdown mask to zero at reconnect.

[sjur.brandeland]

From: Sjur Brændeland <sjur.brandeland@stericsson.com>

Clear caif sockets's shutdown mask at (re)connect.

Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com>
---
 net/caif/caif_socket.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c
index fb89443..78f1cda 100644
--- a/net/caif/caif_socket.c
+++ b/net/caif/caif_socket.c
@@ -220,6 +220,7 @@ static void caif_ctrl_cb(struct cflayer *layr,
 						cfsk_hold, cfsk_put);
 		cf_sk->sk.sk_state = CAIF_CONNECTED;
 		set_tx_flow_on(cf_sk);
+		cf_sk->sk.sk_shutdown = 0;
 		cf_sk->sk.sk_state_change(&cf_sk->sk);
 		break;
 
-- 
1.7.5.4

[net 2/3] caif-hsi: Bugfix - Piggyback'ed embedded CAIF frame lost

[sjur.brandeland]

From: Per Ellefsen <Per.Ellefsen@stericsson.com>

When receiving a piggyback'ed descriptor containing an
embedded frame, but no payload, the embedded frame was
lost.

Signed-off-by: Per Ellefsen <per.ellefsen@stericsson.com>
Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com>
---
 drivers/net/caif/caif_hsi.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c
index 1520814..1f52ff3 100644
--- a/drivers/net/caif/caif_hsi.c
+++ b/drivers/net/caif/caif_hsi.c
@@ -693,8 +693,6 @@ static void cfhsi_rx_done(struct cfhsi *cfhsi)
 			 */
 			memcpy(rx_buf, (u8 *)piggy_desc,
 					CFHSI_DESC_SHORT_SZ);
-			/* Mark no embedded frame here */
-			piggy_desc->offset = 0;
 			if (desc_pld_len == -EPROTO)
 				goto out_of_sync;
 		}
@@ -737,6 +735,8 @@ static void cfhsi_rx_done(struct cfhsi *cfhsi)
 			/* Extract any payload in piggyback descriptor. */
 			if (cfhsi_rx_desc(piggy_desc, cfhsi) < 0)
 				goto out_of_sync;
+			/* Mark no embedded frame after extracting it */
+			piggy_desc->offset = 0;
 		}
 	}
 
-- 
1.7.5.4

[net 3/3] caif-hsi: Add missing return in error path

[sjur.brandeland]

From: Sjur Brændeland <sjur.brandeland@stericsson.com>

Fix a missing return, causing access to freed memory.

Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com>
---
 drivers/net/caif/caif_hsi.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c
index 1f52ff3..4a27adb 100644
--- a/drivers/net/caif/caif_hsi.c
+++ b/drivers/net/caif/caif_hsi.c
@@ -1178,6 +1178,7 @@ int cfhsi_probe(struct platform_device *pdev)
 		dev_err(&ndev->dev, "%s: Registration error: %d.\n",
 			__func__, res);
 		free_netdev(ndev);
+		return -ENODEV;
 	}
 	/* Add CAIF HSI device to list. */
 	spin_lock(&cfhsi_list_lock);
-- 
1.7.5.4

Re: [net 1/3] caif: Clear shutdown mask to zero at reconnect.

[David Miller]

From: sjur.brandeland@stericsson.com
Date: Sun, 24 Jun 2012 23:01:36 +0200

> From: Sjur Brændeland <sjur.brandeland@stericsson.com>
> 
> Clear caif sockets's shutdown mask at (re)connect.
> 
> Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com>

Applied.

Re: [net 2/3] caif-hsi: Bugfix - Piggyback'ed embedded CAIF frame lost

[David Miller]

From: sjur.brandeland@stericsson.com
Date: Sun, 24 Jun 2012 23:01:37 +0200

> From: Per Ellefsen <Per.Ellefsen@stericsson.com>
> 
> When receiving a piggyback'ed descriptor containing an
> embedded frame, but no payload, the embedded frame was
> lost.
> 
> Signed-off-by: Per Ellefsen <per.ellefsen@stericsson.com>
> Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com>

Applied.

Re: [net 3/3] caif-hsi: Add missing return in error path

[David Miller]

From: sjur.brandeland@stericsson.com
Date: Sun, 24 Jun 2012 23:01:38 +0200

> From: Sjur Brændeland <sjur.brandeland@stericsson.com>
> 
> Fix a missing return, causing access to freed memory.
> 
> Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com>

Applied.