linux.git/net/bluetooth/rfcomm, branch v2.6.30

Bluetooth: Fix removing of RFCOMM DLC timer with DEFER_SETUP

2009-04-19T16:56:45+00:00

There is a missing call to rfcomm_dlc_clear_timer in the case that
DEFER_SETUP is used and so the connection gets disconnected after the
timeout even if it was successfully accepted previously.

This patch adds a call to rfcomm_dlc_clear_timer to rfcomm_dlc_accept
which will get called when the user accepts the connection by calling
read() on the socket.

Signed-off-by: Johan Hedberg 
Signed-off-by: Marcel Holtmann

proc tty: remove struct tty_operations::read_proc

2009-04-01T15:59:10+00:00

struct tty_operations::proc_fops took it's place and there is one less
create_proc_read_entry() user now!

Signed-off-by: Alexey Dobriyan 
Cc: Alan Cox 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

2009-03-26T22:23:24+00:00

Conflicts:
	drivers/net/wimax/i2400m/usb-notif.c

Driver core: Fix device_move() vs. dpm list ordering, v2

2009-03-24T23:38:26+00:00

dpm_list currently relies on the fact that child devices will
be registered after their parents to get a correct suspend
order. Using device_move() however destroys this assumption, as
an already registered device may be moved under a newly registered
one.

This patch adds a new argument to device_move(), allowing callers
to specify how dpm_list should be adapted.

Signed-off-by: Cornelia Huck 
Acked-by: Alan Stern 
Signed-off-by: Greg Kroah-Hartman

Bluetooth: Fix RFCOMM usage of in-kernel L2CAP sockets

2009-02-27T05:14:48+00:00

The CID value of L2CAP sockets need to be set to zero. All userspace
applications do this via memset() on the sockaddr_l2 structure. The
RFCOMM implementation uses in-kernel L2CAP sockets and so it has to
make sure that l2_cid is set to zero.

Signed-off-by: Marcel Holtmann

Bluetooth: Change RFCOMM to use BT_CONNECT2 for BT_DEFER_SETUP

2009-02-27T05:14:47+00:00

When BT_DEFER_SETUP is enabled on a RFCOMM socket, then switch its
current state from BT_OPEN to BT_CONNECT2. This gives the Bluetooth
core a unified way to handle L2CAP and RFCOMM sockets. The BT_CONNECT2
state is designated for incoming connections.

Signed-off-by: Marcel Holtmann

Bluetooth: Use general bonding whenever possible

2009-02-27T05:14:40+00:00

When receiving incoming connection to specific services, always use
general bonding. This ensures that the link key gets stored and can be
used for further authentications.

Signed-off-by: Marcel Holtmann

Bluetooth: When encryption is dropped, do not send RFCOMM packets

2009-02-27T05:14:35+00:00

During a role change with pre-Bluetooth 2.1 devices, the remote side drops
the encryption of the RFCOMM connection. We allow a grace period for the
encryption to be re-established, before dropping the connection. During
this grace period, the RFCOMM_SEC_PENDING flag is set. Check this flag
before sending RFCOMM packets.

Signed-off-by: Jaikumar Ganesh 
Signed-off-by: Marcel Holtmann

Bluetooth: Update version numbers

2009-02-27T05:14:34+00:00

With the support for the enhanced security model and the support for
deferring connection setup, it is a good idea to increase various
version numbers.

This is purely cosmetic and has no effect on the behavior, but can
be really helpful when debugging problems in different kernel versions.

Signed-off-by: Marcel Holtmann

Bluetooth: Restrict application of socket options

2009-02-27T05:14:33+00:00

The new socket options should only be evaluated for SOL_BLUETOOTH level
and not for every other level. Previously this causes some minor issues
when detecting if a kernel with certain features is available.

Also restrict BT_SECURITY to SOCK_SEQPACKET for L2CAP and SOCK_STREAM for
the RFCOMM protocol.

Signed-off-by: Marcel Holtmann