From 70197886e38eef49873a11b27f1248532719728a Mon Sep 17 00:00:00 2001
From: Andrei Emeltchenko <andrei.emeltchenko@nokia.com>
Date: Wed, 23 Dec 2009 13:07:14 +0200
Subject: [PATCH] --- yaml --- r: 180201 b: refs/heads/master c:
 e420aba331f44de0eed6871441293a6124d566d1 h: refs/heads/master i:   180199:
 33eb4a39e1566de33b8ad37e3e46fa0ffbdaf9b9 v: v3

---
 [refs]                      | 2 +-
 trunk/net/bluetooth/l2cap.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index be632040cfaa..36330d1b2e9e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fcafde2e6d81aa7901f9b10e6a097592f0637b79
+refs/heads/master: e420aba331f44de0eed6871441293a6124d566d1
diff --git a/trunk/net/bluetooth/l2cap.c b/trunk/net/bluetooth/l2cap.c
index 8acc19ed9c4d..400efa26ddba 100644
--- a/trunk/net/bluetooth/l2cap.c
+++ b/trunk/net/bluetooth/l2cap.c
@@ -1368,7 +1368,6 @@ static int l2cap_ertm_send(struct sock *sk)
 
 	while ((skb = sk->sk_send_head) && (!l2cap_tx_window_full(sk)) &&
 	       !(pi->conn_state & L2CAP_CONN_REMOTE_BUSY)) {
-		tx_skb = skb_clone(skb, GFP_ATOMIC);
 
 		if (pi->remote_max_tx &&
 				bt_cb(skb)->retries == pi->remote_max_tx) {
@@ -1376,6 +1375,8 @@ static int l2cap_ertm_send(struct sock *sk)
 			break;
 		}
 
+		tx_skb = skb_clone(skb, GFP_ATOMIC);
+
 		bt_cb(skb)->retries++;
 
 		control = get_unaligned_le16(tx_skb->data + L2CAP_HDR_SIZE);