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

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

Bluetooth: Remove duplicate constant for RFCOMM PSM 



The RFCOMM_PSM constant is actually a duplicate. So remove it and
use the L2CAP_PSM_RFCOMM constant instead.

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

include/net/bluetooth/rfcomm.h

+0 −2
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ 
#ifndef __RFCOMM_H

#define __RFCOMM_H



#define RFCOMM_PSM 3



#define RFCOMM_CONN_TIMEOUT (HZ * 30)

#define RFCOMM_DISC_TIMEOUT (HZ * 20)

#define RFCOMM_AUTH_TIMEOUT (HZ * 25)

net/bluetooth/rfcomm/core.c

+2 −2
Original line number Diff line number Diff line
@@ -771,7 +771,7 @@ static struct rfcomm_session *rfcomm_session_create(bdaddr_t *src, 


	bacpy(&addr.l2_bdaddr, dst);

	addr.l2_family = AF_BLUETOOTH;

	addr.l2_psm    = cpu_to_le16(RFCOMM_PSM);

	addr.l2_psm    = cpu_to_le16(L2CAP_PSM_RFCOMM);

	addr.l2_cid    = 0;

	addr.l2_bdaddr_type = BDADDR_BREDR;

	*err = kernel_connect(sock, (struct sockaddr *) &addr, sizeof(addr), O_NONBLOCK);
@@ -2038,7 +2038,7 @@ static int rfcomm_add_listener(bdaddr_t *ba) 
	/* Bind socket */

	bacpy(&addr.l2_bdaddr, ba);

	addr.l2_family = AF_BLUETOOTH;

	addr.l2_psm    = cpu_to_le16(RFCOMM_PSM);

	addr.l2_psm    = cpu_to_le16(L2CAP_PSM_RFCOMM);

	addr.l2_cid    = 0;

	addr.l2_bdaddr_type = BDADDR_BREDR;

	err = kernel_bind(sock, (struct sockaddr *) &addr, sizeof(addr));