diff options
author | Jukka Rissanen <jukka.rissanen@linux.intel.com> | 2014-05-28 07:43:04 -0400 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2014-05-31 00:38:37 -0400 |
commit | 6a5e81650aa8f6e636d9537c7f127c0ee4d55eae (patch) | |
tree | 19eaa18f077a128a2860d6de2909bd9b584872d4 | |
parent | 62bbd5b35994eaf30519f126765d7f6af9cd3526 (diff) |
Bluetooth: l2cap: Set more channel defaults
Default values for various channel settings were missing. This
way channel users do not need to set default values themselves.
Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
-rw-r--r-- | net/bluetooth/l2cap_core.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index a1e5bb7d06e8..746848229c85 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c | |||
@@ -471,8 +471,14 @@ void l2cap_chan_set_defaults(struct l2cap_chan *chan) | |||
471 | chan->max_tx = L2CAP_DEFAULT_MAX_TX; | 471 | chan->max_tx = L2CAP_DEFAULT_MAX_TX; |
472 | chan->tx_win = L2CAP_DEFAULT_TX_WINDOW; | 472 | chan->tx_win = L2CAP_DEFAULT_TX_WINDOW; |
473 | chan->tx_win_max = L2CAP_DEFAULT_TX_WINDOW; | 473 | chan->tx_win_max = L2CAP_DEFAULT_TX_WINDOW; |
474 | chan->remote_max_tx = chan->max_tx; | ||
475 | chan->remote_tx_win = chan->tx_win; | ||
474 | chan->ack_win = L2CAP_DEFAULT_TX_WINDOW; | 476 | chan->ack_win = L2CAP_DEFAULT_TX_WINDOW; |
475 | chan->sec_level = BT_SECURITY_LOW; | 477 | chan->sec_level = BT_SECURITY_LOW; |
478 | chan->flush_to = L2CAP_DEFAULT_FLUSH_TO; | ||
479 | chan->retrans_timeout = L2CAP_DEFAULT_RETRANS_TO; | ||
480 | chan->monitor_timeout = L2CAP_DEFAULT_MONITOR_TO; | ||
481 | chan->conf_state = 0; | ||
476 | 482 | ||
477 | set_bit(FLAG_FORCE_ACTIVE, &chan->flags); | 483 | set_bit(FLAG_FORCE_ACTIVE, &chan->flags); |
478 | } | 484 | } |