2012-04-24 19:11:11

by Andre Guedes

Subject: [PATCH] Bluetooth: Remove useless code in hci_connect

This patch removes unneeded variable assignments in hci_connect.
'sec_level' is already assigned to BT_SECURITY_LOW in hci_le_connect
and 'pending_sec_level' and 'auth_type' are assigned right after
if statement.

Signed-off-by: Andre Guedes <[email protected]>
---
net/bluetooth/hci_conn.c | 3 ---
1 file changed, 3 deletions(-)

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index f361d3b..140e00a 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -536,9 +536,6 @@ struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst, __u8
return ERR_PTR(-ENOMEM);

le->dst_type = entry->bdaddr_type;
- le->pending_sec_level = sec_level;
- le->sec_level = BT_SECURITY_LOW;
- le->auth_type = auth_type;
hci_le_connect(le);
}

--
1.7.10

2012-04-25 06:44:05

by Marcel Holtmann

Subject: Re: [PATCH] Bluetooth: Remove useless code in hci_connect

Hi Andre,

> This patch removes unneeded variable assignments in hci_connect.
> 'sec_level' is already assigned to BT_SECURITY_LOW in hci_le_connect
> and 'pending_sec_level' and 'auth_type' are assigned right after
> if statement.
>
> Signed-off-by: Andre Guedes <[email protected]>
> ---
> net/bluetooth/hci_conn.c | 3 ---
> 1 file changed, 3 deletions(-)

patch has been applied to bluetooth-next tree.

Regards

Marcel