From ca4ea96fb79f472ad0f85f1a270aff69ac86cdef Mon Sep 17 00:00:00 2001
From: "Gustavo F. Padovan" <padovan@profusion.mobi>
Date: Tue, 1 Nov 2011 14:06:23 -0200
Subject: [PATCH] --- yaml --- r: 277706 b: refs/heads/master c:
 3e6b3b95f26e1253cd429cf949b9c41598ba3033 h: refs/heads/master v: v3

---
 [refs]                           |  2 +-
 trunk/net/bluetooth/l2cap_core.c | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index c5c944d541f3..bc5ea509f382 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e8b207e8a4442f1a662e1a3827e61e40279630a
+refs/heads/master: 3e6b3b95f26e1253cd429cf949b9c41598ba3033
diff --git a/trunk/net/bluetooth/l2cap_core.c b/trunk/net/bluetooth/l2cap_core.c
index c12d3bf08a42..7d663bd3bc5d 100644
--- a/trunk/net/bluetooth/l2cap_core.c
+++ b/trunk/net/bluetooth/l2cap_core.c
@@ -2237,11 +2237,10 @@ static int l2cap_parse_conf_req(struct l2cap_chan *chan, void *data)
 					return -ECONNREFUSED;
 
 				l2cap_add_conf_opt(&ptr, L2CAP_CONF_EFS,
-								sizeof(efs),
+							sizeof(efs),
 							(unsigned long) &efs);
 			} else {
-				/* Send PENDING Conf Rsp and mark state
-				   local PENDING */
+				/* Send PENDING Conf Rsp */
 				result = L2CAP_CONF_PENDING;
 				set_bit(CONF_LOC_CONF_PEND, &chan->conf_state);
 			}
@@ -2373,8 +2372,8 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len, voi
 		case L2CAP_CONF_EWS:
 			chan->tx_win = min_t(u16, val,
 						L2CAP_DEFAULT_EXT_WINDOW);
-			l2cap_add_conf_opt(&ptr, L2CAP_CONF_EWS,
-							2, chan->tx_win);
+			l2cap_add_conf_opt(&ptr, L2CAP_CONF_EWS, 2,
+							chan->tx_win);
 			break;
 		}
 	}
@@ -2801,7 +2800,7 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr
 		set_bit(CONF_OUTPUT_DONE, &chan->conf_state);
 
 		l2cap_send_cmd(conn, cmd->ident, L2CAP_CONF_RSP,
-				l2cap_build_conf_rsp(chan, rsp,
+					l2cap_build_conf_rsp(chan, rsp,
 					L2CAP_CONF_SUCCESS, 0x0000), rsp);
 	}
 
@@ -2856,7 +2855,7 @@ static inline int l2cap_config_rsp(struct l2cap_conn *conn, struct l2cap_cmd_hdr
 			set_bit(CONF_OUTPUT_DONE, &chan->conf_state);
 
 			l2cap_send_cmd(conn, cmd->ident, L2CAP_CONF_RSP,
-					l2cap_build_conf_rsp(chan, buf,
+						l2cap_build_conf_rsp(chan, buf,
 						L2CAP_CONF_SUCCESS, 0x0000), buf);
 		}
 		goto done;