diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2014-12-20 12:00:41 -0500 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@intel.com> | 2014-12-20 12:55:04 -0500 |
commit | 72e4a6bd02204eed0464d6139439d7e89b94266e (patch) | |
tree | a5723ae2c581509a0d07c3f39fdc92f91b2262d4 /net | |
parent | 23b9ceb74f8e46bddd61a1e2afd9317221be74b7 (diff) |
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>
Diffstat (limited to 'net')
-rw-r--r-- | net/bluetooth/rfcomm/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c index 73f8c75abe6e..4fea24275b17 100644 --- a/net/bluetooth/rfcomm/core.c +++ b/net/bluetooth/rfcomm/core.c | |||
@@ -771,7 +771,7 @@ static struct rfcomm_session *rfcomm_session_create(bdaddr_t *src, | |||
771 | 771 | ||
772 | bacpy(&addr.l2_bdaddr, dst); | 772 | bacpy(&addr.l2_bdaddr, dst); |
773 | addr.l2_family = AF_BLUETOOTH; | 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 | addr.l2_cid = 0; | 775 | addr.l2_cid = 0; |
776 | addr.l2_bdaddr_type = BDADDR_BREDR; | 776 | addr.l2_bdaddr_type = BDADDR_BREDR; |
777 | *err = kernel_connect(sock, (struct sockaddr *) &addr, sizeof(addr), O_NONBLOCK); | 777 | *err = kernel_connect(sock, (struct sockaddr *) &addr, sizeof(addr), O_NONBLOCK); |
@@ -2038,7 +2038,7 @@ static int rfcomm_add_listener(bdaddr_t *ba) | |||
2038 | /* Bind socket */ | 2038 | /* Bind socket */ |
2039 | bacpy(&addr.l2_bdaddr, ba); | 2039 | bacpy(&addr.l2_bdaddr, ba); |
2040 | addr.l2_family = AF_BLUETOOTH; | 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 | addr.l2_cid = 0; | 2042 | addr.l2_cid = 0; |
2043 | addr.l2_bdaddr_type = BDADDR_BREDR; | 2043 | addr.l2_bdaddr_type = BDADDR_BREDR; |
2044 | err = kernel_bind(sock, (struct sockaddr *) &addr, sizeof(addr)); | 2044 | err = kernel_bind(sock, (struct sockaddr *) &addr, sizeof(addr)); |