]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Fri, 2 Nov 2012 02:09:40 +0000 (13:09 +1100)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Fri, 2 Nov 2012 02:08:09 +0000 (13:08 +1100)]
Merge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Fri, 2 Nov 2012 01:55:30 +0000 (12:55 +1100)]
Merge commit 'refs/next/
20121101 /modules'
Stephen Rothwell [Fri, 2 Nov 2012 01:38:50 +0000 (12:38 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Fri, 2 Nov 2012 01:36:59 +0000 (12:36 +1100)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Fri, 2 Nov 2012 01:35:17 +0000 (12:35 +1100)]
Merge remote-tracking branch 'crypto/master'
Stephen Rothwell [Fri, 2 Nov 2012 01:33:38 +0000 (12:33 +1100)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Fri, 2 Nov 2012 01:32:02 +0000 (12:32 +1100)]
Merge remote-tracking branch 'mtd/master'
Stephen Rothwell [Fri, 2 Nov 2012 01:30:25 +0000 (12:30 +1100)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Fri, 2 Nov 2012 01:28:21 +0000 (12:28 +1100)]
Merge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Fri, 2 Nov 2012 01:23:58 +0000 (12:23 +1100)]
Merge remote-tracking branch 'net-next/master'
Stephen Rothwell [Fri, 2 Nov 2012 01:20:00 +0000 (12:20 +1100)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Fri, 2 Nov 2012 01:18:12 +0000 (12:18 +1100)]
Merge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Fri, 2 Nov 2012 01:13:03 +0000 (12:13 +1100)]
Merge remote-tracking branch 'swiotlb/linux-next'
Stephen Rothwell [Fri, 2 Nov 2012 01:11:29 +0000 (12:11 +1100)]
Merge remote-tracking branch 'dlm/next'
Stephen Rothwell [Fri, 2 Nov 2012 01:09:55 +0000 (12:09 +1100)]
Merge remote-tracking branch 'ubi/linux-next'
Stephen Rothwell [Fri, 2 Nov 2012 01:08:17 +0000 (12:08 +1100)]
Merge remote-tracking branch 'thermal/next'
Stephen Rothwell [Fri, 2 Nov 2012 01:08:09 +0000 (12:08 +1100)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'
Conflicts:
drivers/cpuidle/coupled.c
include/linux/cpuidle.h
Stephen Rothwell [Fri, 2 Nov 2012 01:01:42 +0000 (12:01 +1100)]
Merge remote-tracking branch 'acpi/next'
Stephen Rothwell [Fri, 2 Nov 2012 01:01:29 +0000 (12:01 +1100)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Fri, 2 Nov 2012 00:51:02 +0000 (11:51 +1100)]
Merge commit 'refs/next/
20121026 /v4l-dvb'
Stephen Rothwell [Fri, 2 Nov 2012 00:36:54 +0000 (11:36 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Fri, 2 Nov 2012 00:35:25 +0000 (11:35 +1100)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Fri, 2 Nov 2012 00:33:58 +0000 (11:33 +1100)]
Merge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next'
Stephen Rothwell [Fri, 2 Nov 2012 00:32:28 +0000 (11:32 +1100)]
Merge branch 'quilt/i2c'
Stephen Rothwell [Fri, 2 Nov 2012 00:30:53 +0000 (11:30 +1100)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Fri, 2 Nov 2012 00:29:26 +0000 (11:29 +1100)]
Merge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Fri, 2 Nov 2012 00:27:52 +0000 (11:27 +1100)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Fri, 2 Nov 2012 00:26:16 +0000 (11:26 +1100)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Fri, 2 Nov 2012 00:26:08 +0000 (11:26 +1100)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Fri, 2 Nov 2012 00:24:17 +0000 (11:24 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Fri, 2 Nov 2012 00:22:43 +0000 (11:22 +1100)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Fri, 2 Nov 2012 00:21:05 +0000 (11:21 +1100)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Fri, 2 Nov 2012 00:19:37 +0000 (11:19 +1100)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Fri, 2 Nov 2012 00:17:58 +0000 (11:17 +1100)]
Merge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Fri, 2 Nov 2012 00:16:24 +0000 (11:16 +1100)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Fri, 2 Nov 2012 00:14:48 +0000 (11:14 +1100)]
Merge remote-tracking branch 'ceph/master'
Stephen Rothwell [Fri, 2 Nov 2012 00:13:21 +0000 (11:13 +1100)]
Merge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Fri, 2 Nov 2012 00:11:50 +0000 (11:11 +1100)]
Merge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Fri, 2 Nov 2012 00:10:19 +0000 (11:10 +1100)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Fri, 2 Nov 2012 00:08:49 +0000 (11:08 +1100)]
Merge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Fri, 2 Nov 2012 00:08:47 +0000 (11:08 +1100)]
Merge remote-tracking branch 'parisc/for-next'
Stephen Rothwell [Fri, 2 Nov 2012 00:07:17 +0000 (11:07 +1100)]
Merge remote-tracking branch 'openrisc/for-upstream'
Stephen Rothwell [Fri, 2 Nov 2012 00:05:51 +0000 (11:05 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Fri, 2 Nov 2012 00:04:21 +0000 (11:04 +1100)]
Merge remote-tracking branch 'microblaze/next'
Stephen Rothwell [Fri, 2 Nov 2012 00:02:49 +0000 (11:02 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Fri, 2 Nov 2012 00:01:19 +0000 (11:01 +1100)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Thu, 1 Nov 2012 23:59:48 +0000 (10:59 +1100)]
Merge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Thu, 1 Nov 2012 23:58:22 +0000 (10:58 +1100)]
Merge remote-tracking branch 'arm64/upstream'
Stephen Rothwell [Thu, 1 Nov 2012 23:56:56 +0000 (10:56 +1100)]
Merge remote-tracking branch 'xilinx/arm-next'
Stephen Rothwell [Thu, 1 Nov 2012 23:55:24 +0000 (10:55 +1100)]
Merge remote-tracking branch 'arm-perf/for-next/perf'
Stephen Rothwell [Thu, 1 Nov 2012 23:53:57 +0000 (10:53 +1100)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Thu, 1 Nov 2012 23:52:29 +0000 (10:52 +1100)]
Merge remote-tracking branch 'asm-generic/master'
Stephen Rothwell [Thu, 1 Nov 2012 23:50:39 +0000 (10:50 +1100)]
Merge remote-tracking branch 'rr-fixes/fixes'
Stephen Rothwell [Thu, 1 Nov 2012 23:50:21 +0000 (10:50 +1100)]
Merge remote-tracking branch 'spi-current/spi/merge'
Stephen Rothwell [Thu, 1 Nov 2012 23:50:03 +0000 (10:50 +1100)]
Merge remote-tracking branch 'devicetree-current/devicetree/merge'
Stephen Rothwell [Thu, 1 Nov 2012 23:49:48 +0000 (10:49 +1100)]
Merge remote-tracking branch 'crypto-current/master'
Stephen Rothwell [Thu, 1 Nov 2012 23:49:44 +0000 (10:49 +1100)]
Merge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Thu, 1 Nov 2012 23:49:42 +0000 (10:49 +1100)]
Merge remote-tracking branch 'usb.current/usb-linus'
Stephen Rothwell [Thu, 1 Nov 2012 23:49:39 +0000 (10:49 +1100)]
Merge remote-tracking branch 'net/master'
Stephen Rothwell [Thu, 1 Nov 2012 23:49:38 +0000 (10:49 +1100)]
Merge remote-tracking branch 'sparc/master'
Stephen Rothwell [Thu, 1 Nov 2012 23:49:35 +0000 (10:49 +1100)]
Merge remote-tracking branch 'kbuild-current/rc-fixes'
Laxman Dewangan [Thu, 1 Nov 2012 16:38:14 +0000 (22:08 +0530)]
i2c: tegra: set irq name as device name
When watching the irqs name of tegra i2c, all instances
irq name shows as tegra_i2c.
Passing the device name properly to have the irq names with
instance like tegra-i2c.0, tegra-i2c.1 etc.
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Acked-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Philippe Begnic [Wed, 10 Oct 2012 11:02:26 +0000 (13:02 +0200)]
i2c-nomadik: Fixup clock handling
Make sure to clk_prepare as well as clk_enable.
Signed-off-by: Philippe Begnic <philippe.begnic@stericsson.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Wolfram Sang [Fri, 12 Oct 2012 10:55:16 +0000 (11:55 +0100)]
i2c: mxs: remove broken PIOQUEUE support
This I2C master can do DMA and PIOQUEUE (PIO with FIFO). Originally,
only PIOQEUE was supported and it had issues, then DMA support was added
this cycle. The original intention was to keep PIOQUEUE since it has
less overhead what is nice for small transfers. However, runtime
switching between PIOQEUE and DMA depending on the transfer size never
worked despite a lot of trying. Since PIOQUEUE mode itself was flaky
(polling at places where interrupts failed to work) and the
implementation also imposed a size limit for transfers, it is best to
remove the support, so users don't fall over its limitations. It also
makes the driver a lot cleaner and more robust. If somebody really wants
less overhead, plain PIO mode could still be implemented with the
addidtional advantage that this mode is also available on MX23, too.
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Reviewed-by: Marek Vasut <marex@denx.de>
Johan Hedberg [Thu, 1 Nov 2012 11:27:26 +0000 (13:27 +0200)]
Bluetooth: Fix parameter order of hci_get_route
The actual parameter order of hci_get_route is (dst, src) and not (src,
dst). All current callers use the right order but the header file shows
the parameters in the wrong order.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Andrei Emeltchenko [Thu, 1 Nov 2012 13:37:03 +0000 (15:37 +0200)]
Bluetooth: Rename ctrl_id to remote_amp_id
Since we have started to use local_amp_id for local AMP
Controller Id it makes sense to rename ctrl_id to remote_amp_id
since it represents remote AMP controller Id.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Andrei Emeltchenko [Thu, 1 Nov 2012 13:37:02 +0000 (15:37 +0200)]
Bluetooth: Process Create Chan Request
Add processing L2CAP Create Chan Request. When channel is created
save associated high speed link hs_hcon.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Andrei Emeltchenko [Wed, 31 Oct 2012 13:46:36 +0000 (15:46 +0200)]
Bluetooth: AMP: Use l2cap_physical_cfm in phylink complete evt
When receiving HCI Phylink Complete event run amp_physical_cfm
which initialize BR/EDR L2CAP channel associated with High Speed
link and run l2cap_physical_cfm which shall send L2CAP Create
Chan Request.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Andrei Emeltchenko [Wed, 31 Oct 2012 13:46:35 +0000 (15:46 +0200)]
Bluetooth: AMP: Check for hs_hcon instead of ctrl_id
When deciding whether to send EFS configuration response with success,
check rather for existence of High Speed physical link hs_hcon then
ctrl_id. There might be cases when there is ctrl_id but high speed link
is not established yet.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Andrei Emeltchenko [Wed, 31 Oct 2012 13:46:34 +0000 (15:46 +0200)]
Bluetooth: Disconnect logical link when deleting chan
Disconnect logical link for high speed channel hs_hchan
associated with L2CAP channel chan.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Andrei Emeltchenko [Wed, 31 Oct 2012 13:46:33 +0000 (15:46 +0200)]
Bluetooth: AMP: Remove hci_conn receiving error command status
When receiving HCI Event: Command Status for Create Physical Link
with Error code remove AMP hcon.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Andrei Emeltchenko [Wed, 31 Oct 2012 13:46:32 +0000 (15:46 +0200)]
Bluetooth: AMP: Process Disc Physical Link Complete evt
Add processing for HCI Disconnection Physical Link Complete Event.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Andrei Emeltchenko [Wed, 31 Oct 2012 13:46:31 +0000 (15:46 +0200)]
Bluetooth: AMP: Process Disc Logical Link
Add processing for HCI Disconnection Logical Link Complete
Event.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Andrei Emeltchenko [Wed, 31 Oct 2012 13:46:30 +0000 (15:46 +0200)]
Bluetooth: AMP: Add Logical Link Create function
After physical link is created logical link needs to be created.
The process starts after L2CAP channel is created and L2CAP
Configuration Response with result PENDING is received.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Andrei Emeltchenko [Wed, 31 Oct 2012 13:46:29 +0000 (15:46 +0200)]
Bluetooth: Derive remote and local amp id from chan struct
l2cap_chan already keeps information about *_amp_id.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Andrei Emeltchenko [Wed, 31 Oct 2012 13:46:28 +0000 (15:46 +0200)]
Bluetooth: Return correct L2CAP response type
Return L2CAP_CREATE_CHAN_RSP for Create Channel Request and
L2CAP_CONN_RSP for Create Connection Request.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Andrei Emeltchenko [Wed, 31 Oct 2012 13:46:27 +0000 (15:46 +0200)]
Bluetooth: Save hs_hchan instead of hs_hcon in loglink complete
When logical link creation is completed we need to save hs_hchan
which represents logical link instead of hs_hcon representing
physical link. hs_hcon shall be saved when receiving physical link
complete event.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Andrei Emeltchenko [Wed, 31 Oct 2012 13:46:26 +0000 (15:46 +0200)]
Bluetooth: trivial: Fix braces style and remove empty line
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Syam Sidhardhan [Mon, 29 Oct 2012 17:07:36 +0000 (22:37 +0530)]
Bluetooth: mgmt: Use __constant when dealing with constants
__constant_cpu_to_le*() is the right go here.
Signed-off-by: Syam Sidhardhan <s.syam@samsung.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Syam Sidhardhan [Tue, 23 Oct 2012 13:32:17 +0000 (19:02 +0530)]
Bluetooth: Remove unnecessary include export.h
For files only using THIS_MODULE and/or EXPORT_SYMBOL, map
them onto including export.h -- or if the file isn't even
using those, then just delete the include.
Signed-off-by: Syam Sidhardhan <s.syam@samsung.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Andrei Emeltchenko [Thu, 25 Oct 2012 12:20:51 +0000 (15:20 +0300)]
Bluetooth: Add put(hcon) when deleting hchan
When refcnt reaches zero disconnect timeout will run and hci_conn
will be disconnected.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Andrei Emeltchenko [Thu, 25 Oct 2012 12:20:45 +0000 (15:20 +0300)]
Bluetooth: AMP: Process Logical Link complete evt
After receiving HCI Logical Link Complete event finish EFS
configuration by sending L2CAP Conf Response with success code.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Andrei Emeltchenko [Thu, 25 Oct 2012 12:20:44 +0000 (15:20 +0300)]
Bluetooth: AMP: Process Physical Link Complete evt
Add processing for HCI Physical Link Complete event. Upon
successful status received start L2CAP create channel process.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Andrei Emeltchenko [Thu, 25 Oct 2012 12:20:43 +0000 (15:20 +0300)]
Bluetooth: Use helper function sending EFS conf rsp
There is helper function used to send EFS Configuration Response.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Andrei Emeltchenko [Thu, 25 Oct 2012 12:20:42 +0000 (15:20 +0300)]
Bluetooth: trivial: Remove unneeded assignment
Assignment is not needed here since err is always gets value.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Johan Hedberg [Wed, 24 Oct 2012 21:09:53 +0000 (00:09 +0300)]
Bluetooth: Fix sending unnecessary HCI_LE_Host_Enable
This patch fixes sending an unnecessary HCI_LE_Host_Enable command if
the command has already been sent as part of the default HCI init
sequence.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Johan Hedberg [Wed, 24 Oct 2012 21:09:54 +0000 (00:09 +0300)]
Bluetooth: Fix unnecessary EIR update during powering on
When powered on the EIR data gets updated as the last step by mgmt.
Therefore avoid an update when getting a local name update as that's
part of the normal HCI init sequence.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Johan Hedberg [Wed, 24 Oct 2012 21:09:52 +0000 (00:09 +0300)]
Bluetooth: Fix sending unnecessary HCI_Write_SSP_Mode command
This patch fixes sending an unnecessary HCI_Write_SSP_Mode command if
the command has already been sent as part of the default HCI init
sequence.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Johan Hedberg [Wed, 24 Oct 2012 21:09:51 +0000 (00:09 +0300)]
Bluetooth: Fix setting host feature bits for SSP
When we get a successful command complete for HCI_Write_SSP_Mode we need
to update the host feature bits for the hdev struct accordingly.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Johan Hedberg [Wed, 24 Oct 2012 18:12:03 +0000 (21:12 +0300)]
Bluetooth: Disallow LE scanning and connecting in peripheral role
When an adapter is in the LE peripheral role scanning for other devices
or initiating connections to them is not allowed. This patch makes sure
that such attempts will result in appropriate error returns.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Johan Hedberg [Wed, 24 Oct 2012 18:12:02 +0000 (21:12 +0300)]
Bluetooth: Add flag for LE GAP Peripheral role
This patch adds a flag to be used for LE GAP Peripheral role. In this
role undirected advertising will be enabled and operations not allowed
in Peripheral role (such as scanning and initiating connections) will be
disallowed.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Johan Hedberg [Wed, 24 Oct 2012 18:12:01 +0000 (21:12 +0300)]
Bluetooth: Make use feature test macros
For better code readability and avoiding simple bugs of checking the
wrong byte of the features make use of feature test macros whenever
possible.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Johan Hedberg [Wed, 24 Oct 2012 18:12:00 +0000 (21:12 +0300)]
Bluetooth: Add missing feature test macros
This patch adds missing feature test macros needed for various use cases
and also sorts the macros according to the feature bit location in the
feature mask (for easy lookup).
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Johan Hedberg [Wed, 24 Oct 2012 18:11:59 +0000 (21:11 +0300)]
Bluetooth: Fix updating host feature bits for LE
When LE has been enabled with the simultaneous BR/EDR & LE parameter set
to true we should also update the host features stored in struct hci_dev
accordingly.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Johan Hedberg [Wed, 24 Oct 2012 18:11:58 +0000 (21:11 +0300)]
Bluetooth: mgmt: Restrict BR/EDR settings to BR/EDR-only adapters
This patch makes sure that settings which are specific for BR/EDR
capable adapters are not allowed for non-BR/EDR (e.g. LE-only) adapters.
Instead, a "not supported" error is returned of such a setting is
attempted to be set for a non-BR/EDR adapter.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Johan Hedberg [Wed, 24 Oct 2012 18:11:57 +0000 (21:11 +0300)]
Bluetooth: Fix HCI command sending when powering on LE-only adapters
This patch makes sure that we don't send BR/EDR-only commands for
LE-only adapters when they get powered on. Doing this would just cause
command errors.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Denis Kirjanov [Mon, 22 Oct 2012 13:22:01 +0000 (17:22 +0400)]
Bluetooth:Replace list_for_each with list_for_each_entry() helper
Replace list_for_each with list_for_each_entry() helper
Signed-off-by: Denis Kirjanov <kirjanov@gmail.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Trond Myklebust [Thu, 1 Nov 2012 21:07:07 +0000 (17:07 -0400)]
NFSv4.1: Remove the 'FIFO' behaviour for nfs41_setup_sequence
It is more important to preserve the task priority behaviour, which ensures
that things like reclaim writes take precedence over background and kupdate
writes.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Trond Myklebust [Thu, 1 Nov 2012 20:44:05 +0000 (16:44 -0400)]
NFSv4.1: Don't mess with task priorities in nfs41_setup_sequence
We want to preserve the rpc_task priority for things like writebacks,
that may have differing levels of urgency.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>