tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>

authored by

Marcel Holtmann and committed by
Johan Hedberg 72e4a6bd 23b9ceb7

+2 -4
-2
include/net/bluetooth/rfcomm.h
··· 24 24 #ifndef __RFCOMM_H 25 25 #define __RFCOMM_H 26 26 27 - #define RFCOMM_PSM 3 28 - 29 27 #define RFCOMM_CONN_TIMEOUT (HZ * 30) 30 28 #define RFCOMM_DISC_TIMEOUT (HZ * 20) 31 29 #define RFCOMM_AUTH_TIMEOUT (HZ * 25)
+2 -2
net/bluetooth/rfcomm/core.c
··· 771 771 772 772 bacpy(&addr.l2_bdaddr, dst); 773 773 addr.l2_family = AF_BLUETOOTH; 774 - addr.l2_psm = cpu_to_le16(RFCOMM_PSM); 774 + addr.l2_psm = cpu_to_le16(L2CAP_PSM_RFCOMM); 775 775 addr.l2_cid = 0; 776 776 addr.l2_bdaddr_type = BDADDR_BREDR; 777 777 *err = kernel_connect(sock, (struct sockaddr *) &addr, sizeof(addr), O_NONBLOCK); ··· 2038 2038 /* Bind socket */ 2039 2039 bacpy(&addr.l2_bdaddr, ba); 2040 2040 addr.l2_family = AF_BLUETOOTH; 2041 - addr.l2_psm = cpu_to_le16(RFCOMM_PSM); 2041 + addr.l2_psm = cpu_to_le16(L2CAP_PSM_RFCOMM); 2042 2042 addr.l2_cid = 0; 2043 2043 addr.l2_bdaddr_type = BDADDR_BREDR; 2044 2044 err = kernel_bind(sock, (struct sockaddr *) &addr, sizeof(addr));