Re: [Bluez-devel] L2CAP raw socket patch

[Marcel Holtmann <marcel@holtmann.org>]

[-- Attachment #1: Type: text/plain, Size: 367 bytes --]

Hi Collin,

> so what do you all think about the RAW socket patch, does it make sense
> putting it into the official tree?

the original code was even wrong. If a SKB contains two or more commands
or responses the SKB will be put more than once to the raw socket. I am
going to apply the attached patch and hope we don't get a performance
decrease.

Regards

Marcel


[-- Attachment #2: patch --]
[-- Type: text/plain, Size: 836 bytes --]

===== net/bluetooth/l2cap.c 1.36 vs edited =====
--- 1.36/net/bluetooth/l2cap.c	Wed Jan 14 21:56:53 2004
+++ edited/net/bluetooth/l2cap.c	Sun Feb 22 16:22:51 2004
@@ -1629,6 +1629,8 @@
 	struct l2cap_cmd_hdr cmd;
 	int err = 0;
 
+	l2cap_raw_recv(conn, skb);
+
 	while (len >= L2CAP_CMD_HDR_SIZE) {
 		memcpy(&cmd, data, L2CAP_CMD_HDR_SIZE);
 		data += L2CAP_CMD_HDR_SIZE;
@@ -1670,7 +1672,6 @@
 
 		case L2CAP_COMMAND_REJ:
 			/* FIXME: We should process this */
-			l2cap_raw_recv(conn, skb);
 			break;
 
 		case L2CAP_ECHO_REQ:
@@ -1680,11 +1681,10 @@
 		case L2CAP_ECHO_RSP:
 		case L2CAP_INFO_REQ:
 		case L2CAP_INFO_RSP:
-			l2cap_raw_recv(conn, skb);
 			break;
 
 		default:
-			BT_ERR("Uknown signaling command 0x%2.2x", cmd.code);
+			BT_ERR("Unknown signaling command 0x%2.2x", cmd.code);
 			err = -EINVAL;
 			break;
 		}