Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a521149a authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann
Browse files

Bluetooth: Remove useless l2cap_err_to_reason function 



Now that the only reason code this function can return is
L2CAP_REJ_NOT_UNDERSTOOD we can just do the necessary assignment without
needing a separate function at all.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 33a2145e

net/bluetooth/l2cap_core.c

+2 −12
Original line number Diff line number Diff line
@@ -5314,16 +5314,6 @@ static inline int l2cap_le_sig_cmd(struct l2cap_conn *conn, 
	}

}



static __le16 l2cap_err_to_reason(int err)

{

	switch (err) {

	case -EINVAL:

	case -EPROTO:

	default:

		return __constant_cpu_to_le16(L2CAP_REJ_NOT_UNDERSTOOD);

	}

}



static inline void l2cap_le_sig_channel(struct l2cap_conn *conn,

					struct sk_buff *skb)

{
@@ -5356,7 +5346,7 @@ static inline void l2cap_le_sig_channel(struct l2cap_conn *conn, 


		BT_ERR("Wrong link type (%d)", err);



		rej.reason = l2cap_err_to_reason(err);

		rej.reason = __constant_cpu_to_le16(L2CAP_REJ_NOT_UNDERSTOOD);

		l2cap_send_cmd(conn, cmd->ident, L2CAP_COMMAND_REJ,

			       sizeof(rej), &rej);

	}
@@ -5401,7 +5391,7 @@ static inline void l2cap_sig_channel(struct l2cap_conn *conn, 


			BT_ERR("Wrong link type (%d)", err);



			rej.reason = l2cap_err_to_reason(err);

			rej.reason = __constant_cpu_to_le16(L2CAP_REJ_NOT_UNDERSTOOD);

			l2cap_send_cmd(conn, cmd.ident, L2CAP_COMMAND_REJ,

				       sizeof(rej), &rej);

		}