diff options
author | Gustavo F. Padovan <padovan@profusion.mobi> | 2010-05-10 13:22:56 -0400 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2010-07-21 13:39:04 -0400 |
commit | fd059b9bd0af2e217f29d5a34e1c71039d26af8c (patch) | |
tree | ad9a6a786381ff022ee8fb5223e4c748c2ad0e77 /net/bluetooth | |
parent | 11fe883936980fe242869d671092a466cf1db3e3 (diff) |
Bluetooth: Remove max_tx and tx_window module paramenters from L2CAP
We don't need these parameters anymore since we have socket options for
them.
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth')
-rw-r--r-- | net/bluetooth/l2cap.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c index cf3c4073a8a6..fd507cbc7932 100644 --- a/net/bluetooth/l2cap.c +++ b/net/bluetooth/l2cap.c | |||
@@ -60,8 +60,6 @@ static int enable_ertm = 1; | |||
60 | #else | 60 | #else |
61 | static int enable_ertm = 0; | 61 | static int enable_ertm = 0; |
62 | #endif | 62 | #endif |
63 | static int max_transmit = L2CAP_DEFAULT_MAX_TX; | ||
64 | static int tx_window = L2CAP_DEFAULT_TX_WINDOW; | ||
65 | 63 | ||
66 | static u32 l2cap_feat_mask = L2CAP_FEAT_FIXED_CHAN; | 64 | static u32 l2cap_feat_mask = L2CAP_FEAT_FIXED_CHAN; |
67 | static u8 l2cap_fixed_chan[8] = { 0x02, }; | 65 | static u8 l2cap_fixed_chan[8] = { 0x02, }; |
@@ -816,9 +814,9 @@ static void l2cap_sock_init(struct sock *sk, struct sock *parent) | |||
816 | pi->mode = L2CAP_MODE_ERTM; | 814 | pi->mode = L2CAP_MODE_ERTM; |
817 | else | 815 | else |
818 | pi->mode = L2CAP_MODE_BASIC; | 816 | pi->mode = L2CAP_MODE_BASIC; |
819 | pi->max_tx = max_transmit; | 817 | pi->max_tx = L2CAP_DEFAULT_MAX_TX; |
820 | pi->fcs = L2CAP_FCS_CRC16; | 818 | pi->fcs = L2CAP_FCS_CRC16; |
821 | pi->tx_win = tx_window; | 819 | pi->tx_win = L2CAP_DEFAULT_TX_WINDOW; |
822 | pi->sec_level = BT_SECURITY_LOW; | 820 | pi->sec_level = BT_SECURITY_LOW; |
823 | pi->role_switch = 0; | 821 | pi->role_switch = 0; |
824 | pi->force_reliable = 0; | 822 | pi->force_reliable = 0; |
@@ -4682,12 +4680,6 @@ module_exit(l2cap_exit); | |||
4682 | module_param(enable_ertm, bool, 0644); | 4680 | module_param(enable_ertm, bool, 0644); |
4683 | MODULE_PARM_DESC(enable_ertm, "Enable enhanced retransmission mode"); | 4681 | MODULE_PARM_DESC(enable_ertm, "Enable enhanced retransmission mode"); |
4684 | 4682 | ||
4685 | module_param(max_transmit, uint, 0644); | ||
4686 | MODULE_PARM_DESC(max_transmit, "Max transmit value (default = 3)"); | ||
4687 | |||
4688 | module_param(tx_window, uint, 0644); | ||
4689 | MODULE_PARM_DESC(tx_window, "Transmission window size value (default = 63)"); | ||
4690 | |||
4691 | MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>"); | 4683 | MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>"); |
4692 | MODULE_DESCRIPTION("Bluetooth L2CAP ver " VERSION); | 4684 | MODULE_DESCRIPTION("Bluetooth L2CAP ver " VERSION); |
4693 | MODULE_VERSION(VERSION); | 4685 | MODULE_VERSION(VERSION); |