diff --git a/src/linux/drivers/net/bt/btdev.c b/src/linux/drivers/net/bt/btdev.c
index 7c00858850d29aec7bbebcb32175f17c61cdb85d..ce4292974044e5ebfbe90fefd4274f4538c4651f 100644
--- a/src/linux/drivers/net/bt/btdev.c
+++ b/src/linux/drivers/net/bt/btdev.c
@@ -393,11 +393,11 @@ static int bt_mng_file_open(struct inode *node, struct file *filp)
 
 static int bt_mng_file_release(struct inode *node, struct file *filp)
 {
-	struct bt_drv *bt_drv = filp->private_data;
+	struct bt_drv *drv = filp->private_data;
 
 	pr_devel("bt mng file release called");
 
-	atomic_inc(&bt_drv->mng_file->open_limit);
+	atomic_inc(&drv->mng_file->open_limit);
 	return OK;
 }
 
diff --git a/src/linux/drivers/net/bt/btdev.h b/src/linux/drivers/net/bt/btdev.h
index 231c7a8ee27c617eeb0b3151bcb29c20e978ec21..4c4d9654d42f261b52f907071f9a62607f5487d5 100644
--- a/src/linux/drivers/net/bt/btdev.h
+++ b/src/linux/drivers/net/bt/btdev.h
@@ -231,10 +231,10 @@ static inline int bt_virnet_get_ring_packets(const struct bt_virnet *vn)
 static struct bt_table *bt_table_init(void);
 static int bt_table_add_device(struct bt_table *tbl, struct bt_virnet *vn);
 static void bt_table_remove_device(struct bt_table *tbl, struct bt_virnet *vn);
-static void bt_table_delete_all(struct bt_drv *drv);
+static void bt_table_delete_all(struct bt_drv *bt_drv);
 static struct bt_virnet *bt_table_find(struct bt_table *tbl, const char *ifa_name);
-static void bt_table_destroy(struct bt_drv *drv);
-static void bt_delete_io_files(struct bt_drv *drv);
+static void bt_table_destroy(struct bt_drv *bt_drv);
+static void bt_delete_io_files(struct bt_drv *bt_mng);
 static struct bt_io_file **bt_create_io_files(void);
 
 static struct bt_ring *bt_ring_create(void);
@@ -246,7 +246,7 @@ static void bt_ring_consume(struct bt_ring *ring);
 static void bt_ring_destroy(struct bt_ring *ring);
 
 static int bt_virnet_produce_data(struct bt_virnet *dev, void *data);
-static struct bt_virnet *bt_virnet_create(struct bt_drv *drv, u32 id);
-static void bt_virnet_destroy(struct bt_virnet *dev);
+static struct bt_virnet *bt_virnet_create(struct bt_drv *bt_mng, u32 id);
+static void bt_virnet_destroy(struct bt_virnet *vnet);
 
 #endif
diff --git a/src/linux/net/newip/tcp_nip_parameter.c b/src/linux/net/newip/tcp_nip_parameter.c
index 2a2955ebef48546db10dcd0315163cbc34215248..9b24e26b9d9b5ba43e96b98e5bebd77dc181de19 100644
--- a/src/linux/net/newip/tcp_nip_parameter.c
+++ b/src/linux/net/newip/tcp_nip_parameter.c
@@ -30,7 +30,7 @@ module_param_named(af_ninet, g_af_ninet, int, 0444);
 /*                            Rto timeout timer period (HZ/n)                                */
 /*********************************************************************************************/
 /* RTT RTO in the small-delay scenario */
-int g_nip_rto = 50;
+int g_nip_rto = 5;
 module_param_named(nip_rto, g_nip_rto, int, 0644);
 
 int get_nip_rto(void)