Skip to contentSkip to conversation

l2cap.c: adding some kernel-docs

PATCH In review Martin Röhricht 4 participants 6 messages Feb 28, 2006

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 l2cap.c: adding some kernel-docs

This small patch adds kernel-docs for four functions in l2cap.c. Kernel-docs can be used to annotate functions and their parameters like the following:

/**
* l2cap_parse_conf_req - parses a conf req packet for options
* @sk: corresponding socket
* @data: contains type, length and option data
* @len: length of the whole configuration request packet
*
* Parses a configuration request that may contain multiple
configuration
* options. Sets the appropriate configuration request parameters from
the
* remote peer if understood.
*/

One can obtain the information on those annotations in multiple ways, for example by using the man page style:
scripts/kernel-doc -man net/bluetooth/l2cap.c | nroff -man | less

I think it's worth the effort for some functions to keep track of the functionality and the use of different parameters.

Martin

net/bluetooth/l2cap.c +35 -0
@@ -1267,6 +1267,16 @@
 	return len;
 }
 
+/**
+ * l2cap_parse_conf_req - parses a conf req packet for options
+ * @sk: corresponding socket
+ * @data: contains type, length and option data
+ * @len: length of the whole configuration request packet
+ *
+ * Parses a configuration request that may contain multiple configuration 
+ * options. Sets the appropriate configuration request parameters from the 
+ * remote peer if understood.
+ */
 static inline void l2cap_parse_conf_req(struct sock *sk, void *data, u16 len)
 {
 	int type, hint, olen; 
@@ -1303,6 +1313,16 @@
 	}
 }
 
+/**
+ * l2cap_add_conf_opt - adds a conf option to a response or a request
+ * @ptr: pointer to complete option
+ * @type: option type (e.g. L2CAP_CONF_MTU)
+ * @len: length of option in Bytes (e.g. MTU == 2, RFC == 9)
+ * @val: contains the data that is being added
+ *
+ * Adds a complete configuration parameter option to a configuration response
+ * or a configuration request.
+ */
 static void l2cap_add_conf_opt(void **ptr, u8 type, u8 len, unsigned long val)
 {
 	struct l2cap_conf_opt *opt = *ptr;
@@ -1333,6 +1353,14 @@
 	*ptr += L2CAP_CONF_OPT_SIZE + len;
 }
 
+/**
+ * l2cap_build_conf_req - Builds a configuration request
+ * @sk: corresponding socket structure
+ * @data: data portion of a conf request packet (dcid, flags, options)
+ * @return: packet length (dcid, flags and options)
+ *
+ * Builds a configuration request with the help of l2cap_add_conf_opt
+ */
 static int l2cap_build_conf_req(struct sock *sk, void *data)
 {
 	struct l2cap_pinfo *pi = l2cap_pi(sk);
@@ -1372,6 +1400,13 @@
 	return result;
 }
 
+/**
+ * l2cap_build_conf_rsp - Builds a configuration response
+ * @sk: corresponding socket structure
+ * @data: data portion of rsp packet (scid, flags, result, config)
+ * @result: result code for response (success/reject/failure/...)
+ * @return: command length
+ */
 static int l2cap_build_conf_rsp(struct sock *sk, void *data, int *result)
 {
 	struct l2cap_conf_rsp *rsp = data;
#1 lore raw

[Bluez-devel] rfcomm socket connect timeout

Is there a way to reduce the timeout for an rfcomm socket connect?

Signature · 15 lines
Dave Mielke           | 2213 Fox Crescent | I believe that the Bible is the
Phone: 1-613-726-0014 | Ottawa, Ontario   | Word of God. Please contact me
EMail: [email protected] | Canada  K2A 1H7   | if you're concerned about Hell.
http://FamilyRadio.com/                   | http://Mielke.cc/bible/


-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Bluez-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bluez-devel
maintainer
#2 lore raw

Re: [Bluez-devel] rfcomm socket connect timeout

Hi Dave,

Quoted 1 line

Is there a way to reduce the timeout for an rfcomm socket connect?

you are looking for the page timeout (hciconfig hci0 pageto).

Regards

Marcel

-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Bluez-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bluez-devel

#3 lore raw

Re: [Bluez-devel] rfcomm socket connect timeout

[quoted lines by Marcel Holtmann on 2006/02/28 at 16:19 +0100]

Quoted 1 line

you are looking for the page timeout (hciconfig hci0 pageto).

Thanks. I guess I'm not up on Bluetooth terminology. Is there a way to set it via something like setsockopt()? I can't find a constant that looks like it'll do it under "HCI socket options" in hci.h.

Signature · 15 lines
Dave Mielke           | 2213 Fox Crescent | I believe that the Bible is the
Phone: 1-613-726-0014 | Ottawa, Ontario   | Word of God. Please contact me
EMail: [email protected] | Canada  K2A 1H7   | if you're concerned about Hell.
http://FamilyRadio.com/                   | http://Mielke.cc/bible/


-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Bluez-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bluez-devel
maintainer
#4 lore raw

Re: [Bluez-devel] rfcomm socket connect timeout

Hi Dave,

Quoted 5 lines
Quoted 1 line

you are looking for the page timeout (hciconfig hci0 pageto).

Thanks. I guess I'm not up on Bluetooth terminology. Is there a way to set it via something like setsockopt()? I can't find a constant that looks like it'll do it under "HCI socket options" in hci.h.

no, because it is global (ACL) option and not RFCOMM specific.

Regards

Marcel

-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Bluez-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bluez-devel

#5 lore raw

Re: [Bluez-devel] rfcomm socket connect timeout

In reply to Dave Mielke

I don't know if there's a way to do it programmatically but i think it is a built in charachteristic as it is defined as a constant.
I have had problems of this type and all I had to do was go to usr/src/linux/include/net/bluetooth/rfcomm.h and you must change:
#define RFCOMM_CONN_TIMEOUT (HZ * 30)
to:
#define RFCOMM_CONN_TIMEOUT (HZ * X)
where X is a number of your choice.

And after that I rebuild the kernel modules ,all of them as i don't know another way of rebuilding only the bluetooth part.

Dave Mielke <[email protected]> ha scritto:
Is there a way to reduce the timeout for an rfcomm socket connect?

Signature · 20 lines
Dave Mielke | 2213 Fox Crescent | I believe that the Bible is the
Phone: 1-613-726-0014 | Ottawa, Ontario | Word of God. Please contact me
EMail: [email protected] | Canada K2A 1H7 | if you're concerned about Hell.
http://FamilyRadio.com/ | http://Mielke.cc/bible/


-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Bluez-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bluez-devel


		
---------------------------------
Yahoo! Mail: gratis 1GB per i messaggi, antispam, antivirus, POP3