Commit 84d9d071 authored Mar 26, 2012 by Johan Hedberg Committed by Gustavo Padovan Mar 28, 2012

Bluetooth: Don't increment twice in eir_has_data_type()



The parsed variable is already incremented inside the for-loop so there
no need to increment it again (not to mention that the code was
incrementing it the wrong amount).

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo@padovan.org>

parent 8d7e1c7f

include/net/bluetooth/hci_core.h

+3 −4

Original line number	Diff line number	Diff line
		@@ -907,11 +907,10 @@ static inline void hci_role_switch_cfm(struct hci_conn *conn, __u8 status,

		static inline bool eir_has_data_type(u8 *data, size_t data_len, u8 type)
		{
		u8 field_len;
		size_t parsed;
		size_t parsed = 0;

		for (parsed = 0; parsed < data_len - 1; parsed += field_len) {
		field_len = data[0];
		while (parsed < data_len - 1) {
		u8 field_len = data[0];

		if (field_len == 0)
		break;