Linux bluetooth development
 help / color / mirror / Atom feed
From: Andrei Emeltchenko <Andrei.Emeltchenko.news@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH] emulator: Fix magic numbers and remove dead code
Date: Fri, 19 Dec 2014 14:54:05 +0200	[thread overview]
Message-ID: <1418993645-6921-1-git-send-email-Andrei.Emeltchenko.news@gmail.com> (raw)

From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>

Removes logically dead code since conditions were already checked in the
previous statements.
---
 emulator/le.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/emulator/le.c b/emulator/le.c
index 30daa63..91cf31c 100644
--- a/emulator/le.c
+++ b/emulator/le.c
@@ -1236,21 +1236,14 @@ static void cmd_le_set_data_length(struct bt_le *hci,
 	}
 
 	/* Valid range for suggested max TX octets is 0x001b to 0x00fb */
-	if (tx_len < 0x001b || tx_len > 0x00fb) {
+	if (tx_len < DEFAULT_TX_LEN || tx_len > MAX_TX_LEN) {
 		cmd_status(hci, BT_HCI_ERR_INVALID_PARAMETERS,
 					BT_HCI_CMD_LE_SET_DATA_LENGTH);
 		return;
 	}
 
 	/* Valid range for suggested max TX time is 0x0148 to 0x0848 */
-	if (tx_time < 0x0148 || tx_time > 0x0848) {
-		cmd_status(hci, BT_HCI_ERR_INVALID_PARAMETERS,
-					BT_HCI_CMD_LE_SET_DATA_LENGTH);
-		return;
-	}
-
-	/* Max TX len and time shall be less or equal supported */
-	if (tx_len > MAX_TX_LEN || tx_time > MAX_TX_TIME) {
+	if (tx_time < DEFAULT_TX_TIME || tx_time > MAX_TX_TIME) {
 		cmd_status(hci, BT_HCI_ERR_INVALID_PARAMETERS,
 					BT_HCI_CMD_LE_SET_DATA_LENGTH);
 		return;
-- 
2.1.0


             reply	other threads:[~2014-12-19 12:54 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-12-19 12:54 Andrei Emeltchenko [this message]
2014-12-19 13:06 ` [PATCH] emulator: Fix magic numbers and remove dead code Marcel Holtmann
2014-12-22 11:59   ` Andrei Emeltchenko

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1418993645-6921-1-git-send-email-Andrei.Emeltchenko.news@gmail.com \
    --to=andrei.emeltchenko.news@gmail.com \
    --cc=linux-bluetooth@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox