linux.git/drivers/bluetooth, branch v2.6.35-rc4

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

2010-05-21T04:04:44+00:00

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1674 commits)
  qlcnic: adding co maintainer
  ixgbe: add support for active DA cables
  ixgbe: dcb, do not tag tc_prio_control frames
  ixgbe: fix ixgbe_tx_is_paused logic
  ixgbe: always enable vlan strip/insert when DCB is enabled
  ixgbe: remove some redundant code in setting FCoE FIP filter
  ixgbe: fix wrong offset to fc_frame_header in ixgbe_fcoe_ddp
  ixgbe: fix header len when unsplit packet overflows to data buffer
  ipv6: Never schedule DAD timer on dead address
  ipv6: Use POSTDAD state
  ipv6: Use state_lock to protect ifa state
  ipv6: Replace inet6_ifaddr->dead with state
  cxgb4: notify upper drivers if the device is already up when they load
  cxgb4: keep interrupts available when the ports are brought down
  cxgb4: fix initial addition of MAC address
  cnic: Return SPQ credit to bnx2x after ring setup and shutdown.
  cnic: Convert cnic_local_flags to atomic ops.
  can: Fix SJA1000 command register writes on SMP systems
  bridge: fix build for CONFIG_SYSFS disabled
  ARCNET: Limit com20020 PCI ID matches for SOHARD cards
  ...

Fix up various conflicts with pcmcia tree drivers/net/
{pcmcia/3c589_cs.c, wireless/orinoco/orinoco_cs.c and
wireless/orinoco/spectrum_cs.c} and feature removal
(Documentation/feature-removal-schedule.txt).

Also fix a non-content conflict due to pm_qos_requirement getting
renamed in the PM tree (now pm_qos_request) in net/mac80211/scan.c

pcmcia: dev_node removal (write-only drivers)

2010-05-10T08:23:14+00:00

dev_node_t was only used to transport some minor/major numbers
from the PCMCIA device drivers to deprecated userspace helpers.
However, only a few drivers made use of it, and the userspace
helpers are deprecated anyways. Therefore, get rid of dev_node_t .

As a first step, remove any usage of dev_node_t from drivers which
only wrote to this typedef/struct, but did not make use of it.

CC: linux-bluetooth@vger.kernel.org
CC: Harald Welte 
CC: linux-mtd@lists.infradead.org
CC: linux-wireless@vger.kernel.org
CC: netdev@vger.kernel.org
CC: linux-serial@vger.kernel.org
CC: alsa-devel@alsa-project.org
Signed-off-by: Dominik Brodowski

pcmcia: re-work pcmcia_request_irq()

2010-05-10T08:23:13+00:00

Instead of the old pcmcia_request_irq() interface, drivers may now
choose between:

- calling request_irq/free_irq directly. Use the IRQ from *p_dev->irq.

- use pcmcia_request_irq(p_dev, handler_t); the PCMCIA core will
  clean up automatically on calls to pcmcia_disable_device() or
  device ejection.

- drivers still not capable of IRQF_SHARED (or not telling us so) may
  use the deprecated pcmcia_request_exclusive_irq() for the time
  being; they might receive a shared IRQ nonetheless.

CC: linux-bluetooth@vger.kernel.org
CC: netdev@vger.kernel.org
CC: linux-wireless@vger.kernel.org
CC: linux-serial@vger.kernel.org
CC: alsa-devel@alsa-project.org
CC: linux-usb@vger.kernel.org
CC: linux-ide@vger.kernel.org
Signed-off-by: Dominik Brodowski

Bluetooth: Set hdev->dev_type based on Marvell device type

2010-05-10T07:34:04+00:00

Get the device type from MODULE_BRINGUP_REQ command response.

Signed-off-by: Bing Zhao 
Signed-off-by: Marcel Holtmann

Bluetooth: Separate btmrvl_register_hdev() from btmrvl_add_card()

2010-05-10T07:34:03+00:00

Move btmrvl hdev registration code out of btmrvl_add_card().
New function btmrvl_register_hdev() is added.

Signed-off-by: Bing Zhao 
Signed-off-by: Marcel Holtmann

Bluetooth: Decode btmrvl MODULE_BRINGUP_REG response correctly

2010-05-10T07:34:03+00:00

The MODULE_BRINGUP_REQ command response returns success with
either 0x00 or 0x0c.

Signed-off-by: Bing Zhao 
Signed-off-by: Marcel Holtmann

Bluetooth: Fix storing negative values as unsigned char

2010-05-10T07:34:03+00:00

This is mostly cleanup. There is only one caller and it just checks for
non-zero return values. Still "ret" should be int because we want to return
-EINVAL on errors.

Signed-off-by: Dan Carpenter 
Signed-off-by: Marcel Holtmann

Bluetooth: Fix wrong packet type count increment

2010-05-10T07:28:45+00:00

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

Bluetooth: Use the proper function cast to get hdr data

2010-05-10T07:28:45+00:00

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

Bluetooth: Fix return value when bt_skb_alloc fails

2010-05-10T07:28:45+00:00

Set the proper error(ENOMEM), instead of just return 0.

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