aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/l2cap_sock.c
diff options
context:
space:
mode:
authorAndrei Emeltchenko <andrei.emeltchenko@intel.com>2011-11-02 03:57:10 -0400
committerGustavo F. Padovan <padovan@profusion.mobi>2011-11-07 14:24:58 -0500
commit6b3c7104677a731cf6d3638e09d9d6c530b9bc25 (patch)
treef82ae5a17c75defb0fba93212983a5c4cecf8397 /net/bluetooth/l2cap_sock.c
parentb8aabfc92249b239c425da7e4ca85b7e4855e984 (diff)
Bluetooth: Initialize tx_win_max for fixed channel
tx_win_max is initialized during L2CAP configuration phase. For fixed channels (e.g. A2MP) we want to have it initialized when channel is created. Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com> Acked-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth/l2cap_sock.c')
-rw-r--r--net/bluetooth/l2cap_sock.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index 646aefc4f1d7..9ed6501d90f6 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -943,6 +943,7 @@ static void l2cap_sock_init(struct sock *sk, struct sock *parent)
943 chan->fcs = pchan->fcs; 943 chan->fcs = pchan->fcs;
944 chan->max_tx = pchan->max_tx; 944 chan->max_tx = pchan->max_tx;
945 chan->tx_win = pchan->tx_win; 945 chan->tx_win = pchan->tx_win;
946 chan->tx_win_max = pchan->tx_win_max;
946 chan->sec_level = pchan->sec_level; 947 chan->sec_level = pchan->sec_level;
947 chan->flags = pchan->flags; 948 chan->flags = pchan->flags;
948 } else { 949 } else {
@@ -971,6 +972,7 @@ static void l2cap_sock_init(struct sock *sk, struct sock *parent)
971 chan->max_tx = L2CAP_DEFAULT_MAX_TX; 972 chan->max_tx = L2CAP_DEFAULT_MAX_TX;
972 chan->fcs = L2CAP_FCS_CRC16; 973 chan->fcs = L2CAP_FCS_CRC16;
973 chan->tx_win = L2CAP_DEFAULT_TX_WINDOW; 974 chan->tx_win = L2CAP_DEFAULT_TX_WINDOW;
975 chan->tx_win_max = L2CAP_DEFAULT_TX_WINDOW;
974 chan->sec_level = BT_SECURITY_LOW; 976 chan->sec_level = BT_SECURITY_LOW;
975 chan->flags = 0; 977 chan->flags = 0;
976 set_bit(FLAG_FORCE_ACTIVE, &chan->flags); 978 set_bit(FLAG_FORCE_ACTIVE, &chan->flags);