diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-08-10 14:55:10 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-08-10 16:16:58 -0400 |
| commit | 533b12c88d895cf42d5f439e25be2a2ea026b9e8 (patch) | |
| tree | 6d678d8e5e530caee30b85755a481af2219317e0 /include/net | |
| parent | 94597ab23ea10b3bdcba534be00a9f7b35791c07 (diff) | |
| parent | db12d647ccc971ed120199dc7ea5be2b5887d328 (diff) | |
| download | linux-3.10-533b12c88d895cf42d5f439e25be2a2ea026b9e8.tar.gz linux-3.10-533b12c88d895cf42d5f439e25be2a2ea026b9e8.tar.bz2 linux-3.10-533b12c88d895cf42d5f439e25be2a2ea026b9e8.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/bluetooth/l2cap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h index 636724b203e..6c241444f90 100644 --- a/include/net/bluetooth/l2cap.h +++ b/include/net/bluetooth/l2cap.h @@ -33,9 +33,9 @@ #define L2CAP_DEFAULT_FLUSH_TO 0xffff #define L2CAP_DEFAULT_TX_WINDOW 63 #define L2CAP_DEFAULT_MAX_TX 3 -#define L2CAP_DEFAULT_RETRANS_TO 1000 /* 1 second */ +#define L2CAP_DEFAULT_RETRANS_TO 2000 /* 2 seconds */ #define L2CAP_DEFAULT_MONITOR_TO 12000 /* 12 seconds */ -#define L2CAP_DEFAULT_MAX_PDU_SIZE 672 +#define L2CAP_DEFAULT_MAX_PDU_SIZE 1009 /* Sized for 3-DH5 packet */ #define L2CAP_DEFAULT_ACK_TO 200 #define L2CAP_LOCAL_BUSY_TRIES 12 |