diff --git a/[refs] b/[refs]
index 3f21c8ce90b6..fed06b9e9c42 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ea0048575089e9a714e08bc3debec4b1b9d7664
+refs/heads/master: 273759e2c3bd69efe74799c446df69d9ea5ca418
diff --git a/trunk/net/bluetooth/l2cap_core.c b/trunk/net/bluetooth/l2cap_core.c
index 288c8e660377..db59b259297f 100644
--- a/trunk/net/bluetooth/l2cap_core.c
+++ b/trunk/net/bluetooth/l2cap_core.c
@@ -2941,6 +2941,7 @@ static int l2cap_build_conf_req(struct l2cap_chan *chan, void *data)
 		break;
 
 	case L2CAP_MODE_STREAMING:
+		l2cap_txwin_setup(chan);
 		rfc.mode            = L2CAP_MODE_STREAMING;
 		rfc.txwin_size      = 0;
 		rfc.max_transmit    = 0;