Gustavo F. Padovan
77a74c7e08
Bluetooth: Rename l2cap_do_connect() to l2cap_chan_connect()
...
l2cap_chan_connect() is a much better name and reflects what this
functions is doing (or will do once socket dependence is removed from the
core).
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi >
2011-04-27 18:51:34 -03:00
Gustavo F. Padovan
b445003518
Bluetooth: Move conf_state to struct l2cap_chan
...
First move of elements depending on user data.
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi >
2011-04-27 18:51:34 -03:00
Gustavo F. Padovan
5d41ce1dd9
Bluetooth: Refactor L2CAP channel allocation
...
If the allocation happens at l2cap_sock_create() will be able to use the
struct l2cap_chan to store channel info that comes from the user via
setsockopt.
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi >
2011-04-27 18:51:34 -03:00
John W. Linville
cfef6047c4
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
...
Conflicts:
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/rt2x00/rt2x00queue.c
drivers/net/wireless/rt2x00/rt2x00queue.h
2011-04-25 14:34:25 -04:00
Gustavo F. Padovan
cd69a03af1
Bluetooth: Fix wrong comparison in listen()
...
We should check for the pi->scid there.
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi >
2011-04-13 12:20:00 -03:00
Gustavo F. Padovan
58d35f87ef
Bluetooth: Move tx queue to struct l2cap_chan
...
tx_q is the queue used by ERTM mode.
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi >
2011-04-13 12:19:59 -03:00
Gustavo F. Padovan
39d5a3ee35
Bluetooth: Move SREJ list to struct l2cap_chan
...
As part of moving all the Channel related operation to struct l2cap_chan.
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi >
2011-04-13 12:19:47 -03:00
Gustavo F. Padovan
f1c6775be6
Bluetooth: Move srej and busy queues to struct l2cap_chan
...
As part of the moving channel stuff to l2cap_chan.
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi >
2011-04-07 18:06:27 -03:00
Gustavo F. Padovan
e92c8e70fa
Bluetooth: Move ERTM timers to struct l2cap_chan
...
This also triggered a change in l2cap_send_disconn_req() parameters.
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi >
2011-04-07 18:06:27 -03:00
Gustavo F. Padovan
2c03a7a49e
Bluetooth: Move remote info to struct l2cap_chan
...
As part of the moving channel stuff to l2cap_chan.
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi >
2011-04-07 18:06:27 -03:00
Gustavo F. Padovan
42e5c8027b
Bluetooth: Move of ERTM *_seq vars to struct l2cap_chan
...
As part of the moving channel to stuff to struct l2cap_chan.
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi >
2011-04-07 18:06:26 -03:00
Gustavo F. Padovan
525cd1851b
Bluetooth: Move conn_state to struct l2cap_chan
...
This is part of "moving things to l2cap_chan". As one the first move it
triggered a big number of changes in the funcions parameters, basically
changing the struct sock param to struct l2cap_chan.
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi >
2011-04-07 18:06:26 -03:00
Gustavo F. Padovan
710f9b0a42
Bluetooth: clean up l2cap_sock_recvmsg()
...
Move some channel specific stuff to l2cap_core.c, this will make things
more clear.
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi >
2011-04-07 18:06:26 -03:00
Gustavo F. Padovan
73ffa904b7
Bluetooth: Move conf_{req,rsp} stuff to struct l2cap_chan
...
They are also l2cap_chan specific.
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi >
2011-04-07 18:06:26 -03:00
Gustavo F. Padovan
fc7f8a7ed4
Bluetooth: Move ident to struct l2cap_chan
...
ident is chan property, no need to reside on socket.
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi >
2011-04-07 18:06:26 -03:00
Gustavo F. Padovan
48454079c2
Bluetooth: Create struct l2cap_chan
...
struct l2cap_chan cames to create a clear separation between what
properties and data belongs to the L2CAP channel and what belongs to the
socket. By now we just fold the struct sock * in struct l2cap_chan as all
the channel info is struct l2cap_pinfo today.
In the next commits we will see a move of channel stuff to struct
l2cap_chan.
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi >
2011-04-07 18:06:25 -03:00
Linus Torvalds
42933bac11
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
...
* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6:
Fix common misspellings
2011-04-07 11:14:49 -07:00
Andrei Emeltchenko
34bd0273b6
Bluetooth: delete hanging L2CAP channel
...
Sometimes L2CAP connection remains hanging. Make sure that
L2CAP channel is deleted.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@nokia.com >
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi >
2011-03-31 14:25:26 -03:00
Lucas De Marchi
25985edced
Fix common misspellings
...
Fixes generated by 'codespell' and manually reviewed.
Signed-off-by: Lucas De Marchi <lucas.demarchi@profusion.mobi >
2011-03-31 11:26:23 -03:00
Andrei Emeltchenko
a0cc9a1b57
Bluetooth: delete hanging L2CAP channel
...
Sometimes L2CAP connection remains hanging. Make sure that
L2CAP channel is deleted.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@nokia.com >
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi >
2011-03-24 17:04:44 -03:00
Gustavo F. Padovan
e2174ca430
Bluetooth: fix errors reported by checkpatch.pl
...
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi >
2011-02-17 19:16:55 -03:00
Ville Tervo
5589fa9c2d
Bluetooth: Do not send disconn comand over LE links
...
l2cap over LE links can be disconnected without sending
disconnect command first.
Signed-off-by: Ville Tervo <ville.tervo@nokia.com >
Acked-by: Marcel Holtmann <marcel@holtmann.org >
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi >
2011-02-16 16:33:06 -03:00
Ville Tervo
b62f328b8f
Bluetooth: Add server socket support for LE connection
...
Add support for LE server sockets.
Signed-off-by: Ville Tervo <ville.tervo@nokia.com >
Acked-by: Marcel Holtmann <marcel@holtmann.org >
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi >
2011-02-16 16:33:02 -03:00
Ville Tervo
acd7d37085
Bluetooth: Add LE connection support to L2CAP
...
Add basic LE connection support to L2CAP. LE
connection can be created by specifying cid
in struct sockaddr_l2
Signed-off-by: Ville Tervo <ville.tervo@nokia.com >
Acked-by: Marcel Holtmann <marcel@holtmann.org >
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi >
2011-02-16 16:32:55 -03:00
Vasiliy Kulikov
e3fb592b15
Bluetooth: l2cap: fix 1 byte infoleak to userspace
...
Structure l2cap_options has one padding byte between max_tx and
txwin_size fields. This byte in "opts" is copied to userspace
uninitialized.
Signed-off-by: Vasiliy Kulikov <segoon@openwall.com >
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi >
2011-02-11 15:21:29 -02:00
Gustavo F. Padovan
6de0702b5b
Bluetooth: move __l2cap_sock_close() to l2cap_sock.c
...
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi >
2011-02-08 01:46:02 -02:00
Gustavo F. Padovan
05fc1576da
Bluetooth: move l2cap_sock_kill() to l2cap_sock.c
...
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi >
2011-02-08 01:43:32 -02:00
Gustavo F. Padovan
6ddc0485e1
Bluetooth: move L2CAP sock timers function to l2cap_sock.c
...
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi >
2011-02-08 01:43:31 -02:00
Gustavo F. Padovan
fd83ccdb39
Bluetooth: move l2cap_sock_sendmsg() to l2cap_sock.c
...
Also moves some L2CAP sending functions declaration to l2cap.h
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi >
2011-02-08 01:43:31 -02:00
Gustavo F. Padovan
dcba0dba54
Bluetooth: move l2cap_sock_shutdown() to l2cap_sock.c
...
Declare __l2cap_wait_ack() and l2cap_sock_clear_timer() in l2cap.h
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi >
2011-02-08 01:43:31 -02:00
Gustavo F. Padovan
6898325923
Bluetooth: move l2cap_sock_recvmsg() to l2cap_sock.c
...
It causes the move of the declaration of 3 functions to l2cap.h:
l2cap_get_ident(), l2cap_send_cmd(), l2cap_build_conf_req()
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi >
2011-02-08 01:43:31 -02:00
Gustavo F. Padovan
4e34c50bfe
Bluetooth: move l2cap_sock_connect() to l2cap_sock.c
...
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi >
2011-02-08 01:43:31 -02:00
Gustavo F. Padovan
99f4808db0
Bluetooth: move l2cap_sock_getsockopt() to l2cap_sock.c
...
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi >
2011-02-08 01:43:31 -02:00
Gustavo F. Padovan
33575df7be
Bluetooth: move l2cap_sock_setsockopt() to l2cap_sock.c
...
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi >
2011-02-08 01:43:31 -02:00
Gustavo F. Padovan
d7175d5525
Bluetooth: move l2cap_sock_getname() to l2cap_sock.c
...
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi >
2011-02-08 01:43:30 -02:00
Gustavo F. Padovan
c47b7c724b
Bluetooth: move l2cap_sock_accept() to l2cap_sock.c
...
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi >
2011-02-08 01:43:30 -02:00
Gustavo F. Padovan
af6bcd8205
Bluetooth: move l2cap_sock_bind()/listen() to l2cap_sock.c
...
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi >
2011-02-08 01:43:30 -02:00
Gustavo F. Padovan
554f05bb8a
Bluetooth: move l2cap_sock_release() to l2cap_sock.c
...
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi >
2011-02-08 01:43:30 -02:00
Gustavo F. Padovan
65390587c7
Bluetooth: move l2cap_sock_ops to l2cap_sock.c
...
First step to move all l2cap_sock_ops function to l2cap_sock.c
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi >
2011-02-08 01:43:30 -02:00
Gustavo F. Padovan
bb58f747e5
Bluetooth: Initial work for L2CAP split.
...
This patch tries to do the minimal to move l2cap_sock_create() and its
dependencies to l2cap_sock.c. It create a API to initialize and cleanup
the L2CAP sockets from l2cap_core.c through l2cap_init_sockets() and
l2cap_cleanup_sockets().
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi >
2011-02-08 01:43:30 -02:00