From 0f40ff395b8253591dc2b6a038960206b461cb17 Mon Sep 17 00:00:00 2001
From: "Gustavo F. Padovan" <padovan@profusion.mobi>
Date: Mon, 10 May 2010 18:32:04 -0300
Subject: [PATCH] --- yaml --- r: 203823 b: refs/heads/master c:
 f6337c771126420c348b702e012262cfb5f0d56e h: refs/heads/master i:   203821:
 83723ff9ddda7b4452f9a95f553bcd50043d0f41   203819:
 c32ca07027d4d77217e223901c826b92a583fecd   203815:
 34e7a1fd0ac502047a65fa834cd637a94d02fa82   203807:
 965e6ba7ff11f1ef1c0fa547c2887592e1179807 v: v3

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

diff --git a/[refs] b/[refs]
index 8f4ff36e5a09..fefd4ff13d09 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b31c85ce78d3646ac1e90d62969e7cd8cfd8b15
+refs/heads/master: f6337c771126420c348b702e012262cfb5f0d56e
diff --git a/trunk/net/bluetooth/l2cap.c b/trunk/net/bluetooth/l2cap.c
index 6c5462b2a244..7e39d9ee0b9c 100644
--- a/trunk/net/bluetooth/l2cap.c
+++ b/trunk/net/bluetooth/l2cap.c
@@ -3796,7 +3796,7 @@ static inline int l2cap_data_channel_iframe(struct sock *sk, u16 rx_control, str
 	u8 tx_seq = __get_txseq(rx_control);
 	u8 req_seq = __get_reqseq(rx_control);
 	u8 sar = rx_control >> L2CAP_CTRL_SAR_SHIFT;
-	u8 tx_seq_offset, expected_tx_seq_offset;
+	int tx_seq_offset, expected_tx_seq_offset;
 	int num_to_ack = (pi->tx_win/6) + 1;
 	int err = 0;
 
@@ -4081,7 +4081,8 @@ static inline int l2cap_data_channel(struct l2cap_conn *conn, u16 cid, struct sk
 	struct sock *sk;
 	struct l2cap_pinfo *pi;
 	u16 control, len;
-	u8 tx_seq, req_seq, next_tx_seq_offset, req_seq_offset;
+	u8 tx_seq, req_seq;
+	int next_tx_seq_offset, req_seq_offset;
 
 	sk = l2cap_get_chan_by_scid(&conn->chan_list, cid);
 	if (!sk) {