]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
Bluetooth: Remove max_tx and tx_window module paramenters from L2CAP
authorGustavo F. Padovan <padovan@profusion.mobi>
Mon, 10 May 2010 17:22:56 +0000 (14:22 -0300)
committerMarcel Holtmann <marcel@holtmann.org>
Wed, 21 Jul 2010 17:39:04 +0000 (10:39 -0700)
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>
net/bluetooth/l2cap.c

index cf3c4073a8a655d6e9d8936cb61d30254224962f..fd507cbc79323ef76df9c77d3e8aa3914e40da91 100644 (file)
@@ -60,8 +60,6 @@ static int enable_ertm = 1;
 #else
 static int enable_ertm = 0;
 #endif
-static int max_transmit = L2CAP_DEFAULT_MAX_TX;
-static int tx_window = L2CAP_DEFAULT_TX_WINDOW;
 
 static u32 l2cap_feat_mask = L2CAP_FEAT_FIXED_CHAN;
 static u8 l2cap_fixed_chan[8] = { 0x02, };
@@ -816,9 +814,9 @@ static void l2cap_sock_init(struct sock *sk, struct sock *parent)
                        pi->mode = L2CAP_MODE_ERTM;
                else
                        pi->mode = L2CAP_MODE_BASIC;
-               pi->max_tx = max_transmit;
+               pi->max_tx = L2CAP_DEFAULT_MAX_TX;
                pi->fcs  = L2CAP_FCS_CRC16;
-               pi->tx_win = tx_window;
+               pi->tx_win = L2CAP_DEFAULT_TX_WINDOW;
                pi->sec_level = BT_SECURITY_LOW;
                pi->role_switch = 0;
                pi->force_reliable = 0;
@@ -4682,12 +4680,6 @@ module_exit(l2cap_exit);
 module_param(enable_ertm, bool, 0644);
 MODULE_PARM_DESC(enable_ertm, "Enable enhanced retransmission mode");
 
-module_param(max_transmit, uint, 0644);
-MODULE_PARM_DESC(max_transmit, "Max transmit value (default = 3)");
-
-module_param(tx_window, uint, 0644);
-MODULE_PARM_DESC(tx_window, "Transmission window size value (default = 63)");
-
 MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");
 MODULE_DESCRIPTION("Bluetooth L2CAP ver " VERSION);
 MODULE_VERSION(VERSION);