25 Aug, 2009
1 commit
-
The error message "Removed only %u out of %u pkts" is printed when multiple
to be acked packets are queued.if (i++ >= pkts_to_be_removed)
break;This will break out of the loop and increase the counter i when
i==pkts_to_be_removed and the loop ends up with i=pkts_to_be_removed+1.The following line
if (i != pkts_to_be_removed) {
BT_ERR("Removed only %u out of %u pkts", i, pkts_to_be_removed);
}will then display the false message.
The counter i must not increase on the same statement.
Signed-off-by: Wending Weng
Signed-off-by: Marcel Holtmann
24 Aug, 2009
2 commits
-
Simplify more conversions to the right endian with the proper helpers.
Signed-off-by: Gustavo F. Padovan
Signed-off-by: Marcel Holtmann -
Avoid race conditions when accessing the L2CAP socket from within the
timeout handlers.Signed-off-by: Gustavo F. Padovan
Signed-off-by: Marcel Holtmann
23 Aug, 2009
37 commits
-
When using DEFER_SETUP on a RFCOMM socket, a SABM frame triggers
authorization which when rejected send a DM response. This is fine
according to the RFCOMM spec:the responding implementation may replace the "proper" response
on the Multiplexer Control channel with a DM frame, sent on the
referenced DLCI to indicate that the DLCI is not open, and that
the responder would not grant a request to open it later either.But some stacks doesn't seems to cope with this leaving DLCI 0 open after
receiving DM frame.To fix it properly a timer was introduced to rfcomm_session which is used
to set a timeout when the last active DLC of a session is unlinked, this
will give the remote stack some time to reply with a proper DISC frame on
DLCI 0 avoiding both sides sending DISC to each other on stacks that
follow the specification and taking care of those who don't by taking
down DLCI 0.Signed-off-by: Luiz Augusto von Dentz
Signed-off-by: Marcel Holtmann -
Support for receiving of SREJ frames as specified by the state table.
Signed-off-by: Gustavo F. Padovan
Signed-off-by: Marcel Holtmann -
When L2CAP loses an I-frame we send a SREJ frame to the transmitter side
requesting the lost packet. This patch implement all Recv I-frame events
on SREJ_SENT state table except the ones that deal with SendRej (the REJ
exception at receiver side is yet not implemented).Signed-off-by: Gustavo F. Padovan
Signed-off-by: Marcel Holtmann -
Implement CRC16 check for L2CAP packets. FCS is used by Streaming Mode and
Enhanced Retransmission Mode and is a extra check for the packet content.Using CRC16 is the default, L2CAP won't use FCS only when both side send
a "No FCS" request.Initially based on a patch from Nathan Holstein
Signed-off-by: Gustavo F. Padovan
Signed-off-by: Marcel Holtmann -
Streaming Mode is helpful for the Bluetooth streaming based profiles, such
as A2DP. It doesn't have any error control or flow control.Signed-off-by: Gustavo F. Padovan
Signed-off-by: Marcel Holtmann -
L2CAP uses retransmission and monitor timers to inquiry the other side
about unacked I-frames. After sending each I-frame we (re)start the
retransmission timer. If it expires, we start a monitor timer that send a
S-frame with P bit set and wait for S-frame with F bit set. If monitor
timer expires, try again, at a maximum of L2CAP_DEFAULT_MAX_TX.Signed-off-by: Gustavo F. Padovan
Signed-off-by: Marcel Holtmann -
When receiving an I-frame with unexpected txSeq, receiver side start the
recovery procedure by sending a REJ S-frame to the transmitter side. So
the transmitter can re-send the lost I-frame.This patch just adds a basic support for retransmission, it doesn't
mean that ERTM now has full support for packet retransmission.Signed-off-by: Gustavo F. Padovan
Signed-off-by: Marcel Holtmann -
ERTM should use Segmentation and Reassembly to break down a SDU in many
PDUs on sending data to the other side.On sending packets we queue all 'segments' until end of segmentation and
just the add them to the queue for sending. On receiving we create a new
SKB with the SDU reassembled.Initially based on a patch from Nathan Holstein
Signed-off-by: Gustavo F. Padovan
Signed-off-by: Marcel Holtmann -
This patch adds support for ERTM transfers, without retransmission, with
txWindow up to 63 and with acknowledgement of packets received. Now the
packets are queued before call l2cap_do_send(), so packets couldn't be
sent at the time we call l2cap_sock_sendmsg(). They will be sent in
an asynchronous way on later calls of l2cap_ertm_send(). Besides if an
error occurs on calling l2cap_do_send() we disconnect the channel.Initially based on a patch from Nathan Holstein
Signed-off-by: Gustavo F. Padovan
Signed-off-by: Marcel Holtmann -
The code for sending a disconnect request was repeated several times
within L2CAP source code. So move this into its own function.Signed-off-by: Gustavo F. Padovan
Signed-off-by: Marcel Holtmann -
Add support to config_req and config_rsp to configure ERTM and Streaming
mode. If the remote device specifies ERTM or Streaming mode, then the
same mode is proposed. Otherwise ERTM or Basic mode is used. And in case
of a state 2 device, the remote device should propose the same mode. If
not, then the channel gets disconnected.Signed-off-by: Gustavo F. Padovan
Signed-off-by: Marcel Holtmann -
When trying to establish a connection with Enhanced Retransmission mode
enabled, the RFC option needs to be added to the configuration.Signed-off-by: Marcel Holtmann
-
To enable Enhanced Retransmission mode it needs to be set via a socket
option. A different mode can be set on a socket, but on listen() and
connect() the mode is checked and ERTM is only allowed if it is enabled
via the module parameter.Signed-off-by: Marcel Holtmann
-
Since the Enhanced Retransmission mode for L2CAP is still under heavy
development disable it by default and provide a module option to enable
it manually for testing.Signed-off-by: Marcel Holtmann
-
The rfcomm_init bug fix went into the kernel premature before it got fully
reviewed and acknowledged by the Bluetooth maintainer. So fix up the coding
style now.Signed-off-by: Marcel Holtmann
-
hdev->req_lock is used as mutex so make it a mutex.
Signed-off-by: Thomas Gleixner
Signed-off-by: Marcel Holtmann -
Check that the result of kmalloc is not NULL before dereferencing it.
The patch also replaces kmalloc + memset by kzalloc.The semantic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)//
@@
expression *x;
identifier f;
constant char *C;
@@x = \(kmalloc\|kcalloc\|kzalloc\)(...);
... when != x == NULL
when != x != NULL
when != (x || ...)
(
kfree(x)
|
f(...,C,...,x,...)
|
*f(...,x,...)
|
*x->f
)
//Signed-off-by: Julia Lawall
Signed-off-by: Marcel Holtmann -
The driver uses "u32" for alignment check and calculation which
works only on 32-bit system. It will crash the 64-bit system.
Replace "u32" with "unsigned long" to fix this issue.Signed-off-by: Bing Zhao
Signed-off-by: Marcel Holtmann -
The Marvell Bluetooth driver is full of Enter/Leave debug statements and
all of them are really pointless and only clutter the code. Seems to be
some left-overs when they ported the driver from Windows. For the Linux
driver lets remove these.Signed-off-by: Marcel Holtmann
-
After fixing the driver to use skb_put properly for their HCI commands
only a few compiler warnings are left. Add proper casting for them.Signed-off-by: Marcel Holtmann
-
The Marvell driver has some weird quirks on how to construct proper SKBs
with Bluetooth HCI commands. Fix it to use skb_put properly and also
use hci_opcode_pack instead of self-crafted macro.Signed-off-by: Marcel Holtmann
-
For some reason the btmrvl_device struct has a name field that the SDIO
fills in, but then never ever uses again. That is totally pointless and
so just remove it.Signed-off-by: Marcel Holtmann
-
Make the module description entries for the core and also the Marvell
SDIO driver match common practive inside the Bluetooth subsystem.Signed-off-by: Marcel Holtmann
-
The Marvell Bluetooth SDIO driver has a really complicated concept on how
firmware names are assigned to specific device ids. Fix that by doing a
proper structure and assign it to the module device table.And while at it fix various coding style weirdness that is still present
in this driver.Signed-off-by: Marcel Holtman
-
The Marvell core Bluetooth driver has various weird casting and unneeded
braces in its code that makes it hard to read. Remove all of these to
make the code a little bit simpler.Signed-off-by: Marcel Holtmann
-
The Marvell Bluetooth driver has debugfs support and they are casting
like there is no tomorrow. Remove all of them and magically the code
becomes more readable.Signed-off-by: Marcel Holtmann
-
Both header files of the Marvell Bluetooth driver are private anyway and
if the driver happens to include them twice or they create a circular
dependency then the driver needs fixing. So just remove both pointless
ifdefs.Signed-off-by: Marcel Holtmann
-
The Makefile entry for the Marvell driver is broken when it comes to
handling the optional DEBUG_FS correctly. That must have been the reason
why they were using select in Kconfig in the first place. Fix this and
make it really optional.Signed-off-by: Marcel Holtmann
-
The Marvell driver selects DEBUG_FS and FW_LOADER for its core driver
and that is pointless. Don't select DEBUG_FS since it is either enabled
or not and it is not for the driver to enable it. Also FW_LOADER is
only used within the SDIO driver and so just have that one select the
FW_LOADER option.Signed-off-by: Marcel Holtmann
-
add btmrvl.txt to Documentation/
This patch incorporates a lot of comments given by
Nicolas Pitre . Many thanks to Nicolas Pitre.Signed-off-by: Rahul Tank
Signed-off-by: Bing Zhao
Signed-off-by: Marcel Holtmann -
/debug/btmrvl/config/
/debug/btmrvl/status/See Documentation/btmrvl.txt for details.
This patch incorporates a lot of comments given by
Nicolas Pitre . Many thanks to Nicolas Pitre.Signed-off-by: Rahul Tank
Signed-off-by: Bing Zhao
Signed-off-by: Marcel Holtmann -
This driver supports Marvell Bluetooth enabled devices with SDIO
interface. Currently only SD8688 chip is supported.The helper/firmware images of SD8688 can be downloaded from this tree:
git://git.infradead.org/users/dwmw2/linux-firmware.gitThis patch incorporates a lot of comments given by
Nicolas Pitre . Many thanks to Nicolas Pitre.Signed-off-by: Rahul Tank
Signed-off-by: Bing Zhao
Signed-off-by: Marcel Holtmann -
This driver provides basic definitions and library functions to
support Marvell Bluetooth enabled devices, such as 88W8688 WLAN/BT
combo chip.This patch incorporates a lot of comments given by
Nicolas Pitre . Many thanks to Nicolas Pitre.Signed-off-by: Rahul Tank
Signed-off-by: Bing Zhao
Signed-off-by: Marcel Holtmann -
The core exports the hci_conn_hold_device() and hci_conn_put_device()
functions for device reference of connections. Use this to ensure that
the uevents from the parent are send after the child ones.Based on a report by Brian Rogers
Signed-off-by: Marcel Holtmann
-
The device model itself has no real usable reference counting at the
moment and this causes problems if parents are deleted before their
children. The device model itself handles the memory details of this
correctly, but the uevent order is not consistent. This causes various
problems for systems like HAL or even X.So until device_put() does a proper cleanup, the device for Bluetooth
connection will be protected with an extra reference counting to ensure
the correct order of uevents when connections are terminated.This is not an automatic feature. Higher Bluetooth layers like HIDP or
BNEP should grab this new reference to ensure that their uevents are
send before the ones from the parent device.Based on a report by Brian Rogers
Signed-off-by: Marcel Holtmann
-
Currently the HID subsystem will create HIDRAW devices for the transport
driver, but it will not disconnect them. Until the HID subsytem gets
fixed, ensure that HIDRAW and HIDDEV devices are disconnected when the
Bluetooth HID device gets removed.Based on a patch from Brian Rogers
Signed-off-by: Marcel Holtmann
-
This patch increases the receive buffer size to HCI_MAX_FRAME_SIZE
which improves the RX throughput considerably.Tested against BRM/Atheros/CSR USB Dongles with PAN profile using
iperf and chariot. This gave significant (around 40%) increase
in performance (increased from 0.8 to 1.5 Mb/s in Sheld room)Signed-off-by: Vikram Kandukuri
Signed-off-by: Marcel Holtmann
