linux.git/net/bluetooth/l2cap.c, branch master

Bluetooth: Rename l2cap.c to l2cap_core.c

2011-02-08T03:43:15+00:00

In a preparation to the the L2CAP code split in many files.

Signed-off-by: Gustavo F. Padovan

Bluetooth: Do not use assignments in IF conditions

2011-02-08T03:40:08+00:00

Fix checkpatch warnings concerning assignments in if conditions.

Signed-off-by: Andrei Emeltchenko 
Signed-off-by: Gustavo F. Padovan

Bluetooth: Fix setting of MTU for ERTM and Streaming Mode

2011-02-08T03:40:04+00:00

The desired MTU should be sent in an Config_Req for all modes.

Signed-off-by: Gustavo F. Padovan

Bluetooth: Use non-flushable by default L2CAP data packets

2011-02-08T03:40:04+00:00

Modification of Nick Pelly  patch.

With Bluetooth 2.1 ACL packets can be flushable or non-flushable. This commit
makes ACL data packets non-flushable by default on compatible chipsets, and
adds the BT_FLUSHABLE socket option to explicitly request flushable ACL
data packets for a given L2CAP socket. This is useful for A2DP data which can
be safely discarded if it can not be delivered within a short time (while
other ACL data should not be discarded).

Note that making ACL data flushable has no effect unless the automatic flush
timeout for that ACL link is changed from its default of 0 (infinite).

Default packet types (for compatible chipsets):
Frame 34: 13 bytes on wire (104 bits), 13 bytes captured (104 bits)
Bluetooth HCI H4
Bluetooth HCI ACL Packet
    .... 0000 0000 0010 = Connection Handle: 0x0002
    ..00 .... .... .... = PB Flag: First Non-automatically Flushable Packet (0)
    00.. .... .... .... = BC Flag: Point-To-Point (0)
    Data Total Length: 8
Bluetooth L2CAP Packet

After setting BT_FLUSHABLE
(sock.setsockopt(274 /*SOL_BLUETOOTH*/, 8 /* BT_FLUSHABLE */, 1 /* flush */))
Frame 34: 13 bytes on wire (104 bits), 13 bytes captured (104 bits)
Bluetooth HCI H4
Bluetooth HCI ACL Packet
    .... 0000 0000 0010 = Connection Handle: 0x0002
    ..10 .... .... .... = PB Flag: First Automatically Flushable Packet (2)
    00.. .... .... .... = BC Flag: Point-To-Point (0)
    Data Total Length: 8
Bluetooth L2CAP Packet

Signed-off-by: Andrei Emeltchenko 
Signed-off-by: Gustavo F. Padovan

Bluetooth: Set conn state to BT_DISCONN to avoid multiple responses

2011-02-02T14:47:59+00:00

This patch fixes a minor issue that two connection responses will be sent
for one L2CAP connection request. If the L2CAP connection request is first
blocked due to security reason and responded with reason "security block",
the state of the connection remains BT_CONNECT2. If a pairing procedure
completes successfully before the ACL connection is down, local host will
send another connection complete response. See the following packets
captured by hcidump.

2010-12-07 22:21:24.928096 < ACL data: handle 12 flags 0x00 dlen 16
    0000: 0c 00 01 00 03 19 08 00  41 00 53 00 03 00 00 00  ........A.S.....
... ...

2010-12-07 22:21:35.791747 > HCI Event: Auth Complete (0x06) plen 3
    status 0x00 handle 12
... ...

2010-12-07 22:21:35.872372 > ACL data: handle 12 flags 0x02 dlen 16
    L2CAP(s): Connect rsp: dcid 0x0054 scid 0x0040 result 0 status 0
      Connection successful

Signed-off-by: Liang Bao 
Acked-by: Ville Tervo 
Signed-off-by: Gustavo F. Padovan

Bluetooth: Fix authentication request for L2CAP raw sockets

2011-01-19T16:40:43+00:00

When there is an existing connection l2cap_check_security needs to be
called to ensure that the security level of the new socket is fulfilled.
Normally l2cap_do_start takes care of this, but that function doesn't
get called for SOCK_RAW type sockets. This patch adds the necessary
l2cap_check_security call to the appropriate branch in l2cap_do_connect.

Signed-off-by: Johan Hedberg 
Acked-by: Marcel Holtmann 
Signed-off-by: Gustavo F. Padovan

Bluetooth: Create a unified auth_type evaluation function

2011-01-19T16:40:43+00:00

The logic for determining the needed auth_type for an L2CAP socket is
rather complicated and has so far been duplicated in
l2cap_check_security as well as l2cap_do_connect. Additionally the
l2cap_check_security code was completely missing the handling of
SOCK_RAW type sockets. This patch creates a unified function for the
evaluation and makes l2cap_do_connect and l2cap_check_security use that
function.

Signed-off-by: Johan Hedberg 
Acked-by: Marcel Holtmann 
Signed-off-by: Gustavo F. Padovan

Bluetooth: l2cap: fix misuse of logical operation in place of bitop

2011-01-19T16:40:42+00:00

CC: Marcel Holtmann 
CC: "Gustavo F. Padovan" 
CC: João Paulo Rechi Vita 
Signed-off-by: David Sterba 
Signed-off-by: Gustavo F. Padovan

Bluetooth: Don't accept ConfigReq if we aren't in the BT_CONFIG state

2010-12-06T17:37:50+00:00

If such event happens we shall reply with a Command Reject, because we are
not expecting any configure request.

Signed-off-by: Gustavo F. Padovan 
Signed-off-by: Marcel Holtmann

Bluetooth: clean up l2cap code

2010-12-01T23:04:43+00:00

Do not initialize static vars to zero, macros with complex values
shall be enclosed with (), remove unneeded braces.

Signed-off-by: Andrei Emeltchenko 
Signed-off-by: Gustavo F. Padovan