linux.git/net/bluetooth, branch v3.2-rc1

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

2011-11-07T18:55:33+00:00

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (47 commits)
  forcedeth: fix a few sparse warnings (variable shadowing)
  forcedeth: Improve stats counters
  forcedeth: remove unneeded stats updates
  forcedeth: Acknowledge only interrupts that are being processed
  forcedeth: fix race when unloading module
  MAINTAINERS/rds: update maintainer
  wanrouter: Remove kernel_lock annotations
  usbnet: fix oops in usbnet_start_xmit
  ixgbe: Fix compile for kernel without CONFIG_PCI_IOV defined
  etherh: Add MAINTAINERS entry for etherh
  bonding: comparing a u8 with -1 is always false
  sky2: fix regression on Yukon Optima
  netlink: clarify attribute length check documentation
  netlink: validate NLA_MSECS length
  i825xx:xscale:8390:freescale: Fix Kconfig dependancies
  macvlan: receive multicast with local address
  tg3: Update version to 3.121
  tg3: Eliminate timer race with reset_task
  tg3: Schedule at most one tg3_reset_task run
  tg3: Obtain PCI function number from device
  ...

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth

2011-11-02T19:15:51+00:00

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31T23:30:30+00:00

These files are non modular, but need to export symbols using
the macros now living in export.h -- call out the include so
that things won't break when we remove the implicit presence
of module.h from everywhere.

Signed-off-by: Paul Gortmaker

net: Fix files explicitly needing to include module.h

2011-10-31T23:30:28+00:00

With calls to modular infrastructure, these files really
needs the full module.h header.  Call it out so some of the
cleanups of implicit and unrequired includes elsewhere can be
cleaned up.

Signed-off-by: Paul Gortmaker

Bluetooth: Set HCI_MGMT flag only in read_controller_info

2011-10-31T19:31:02+00:00

The HCI_MGMT flag should only be set when user space requests the full
controller information. This way we avoid potential issues with setting
change events ariving before the actual read_controller_info command
finishes.

Signed-off-by: Johan Hedberg 
Signed-off-by: Gustavo F. Padovan

Bluetooth: Increase HCI reset timeout in hci_dev_do_close

2011-10-31T19:10:18+00:00

I've noticed that my CSR usb dongle was not working if it was plugged in when
PC was booting. It looks like I get two HCI reset command complete events (see
hcidump logs below).
The root cause is reset called from off_timer. Timeout for this reset to
complete is set to 250ms and my bt dongle requires more time for replying with
command complete event. After that, chip seems to reply with reset command
complete event for next non-reset command.

Attached patch increase mentioned timeout to HCI_INIT_TIMEOUT, this value is
already used for timeouting hci_reset_req in hci_dev_reset().

This might also be related to BT not working after suspend that was reported
here some time ago.

Hcidump log:

2011-09-12 23:13:27.379465 < HCI Command: Reset (0x03|0x0003) plen 0
2011-09-12 23:13:27.380797 > HCI Event: Command Complete (0x0e) plen 4
    Reset (0x03|0x0003) ncmd 1
    status 0x00
2011-09-12 23:13:27.380859 < HCI Command: Read Local Supported Features (0x04|0x000
3) plen 0
2011-09-12 23:13:27.760789 > HCI Event: Command Complete (0x0e) plen 4
    Reset (0x03|0x0003) ncmd 1
    status 0x00
2011-09-12 23:13:27.760831 < HCI Command: Read Local Version Information (0x04|0x00
01) plen 0
2011-09-12 23:13:27.764780 > HCI Event: Command Complete (0x0e) plen 12
    Read Local Version Information (0x04|0x0001) ncmd 1
    status 0x00
    HCI Version: 1.1 (0x1) HCI Revision: 0x36f
    LMP Version: 1.1 (0x1) LMP Subversion: 0x36f
    Manufacturer: Cambridge Silicon Radio (10)

Signed-off-by: Szymon Janc 
Signed-off-by: Gustavo F. Padovan

Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/davem/net

2011-10-24T22:18:09+00:00

bluetooth: Properly clone LSM attributes to newly created child connections

2011-10-19T03:36:43+00:00

The Bluetooth stack has internal connection handlers for all of the various
Bluetooth protocols, and unfortunately, they are currently lacking the LSM
hooks found in the core network stack's connection handlers.  I say
unfortunately, because this can cause problems for users who have have an
LSM enabled and are using certain Bluetooth devices.  See one problem
report below:

 * http://bugzilla.redhat.com/show_bug.cgi?id=741703

In order to keep things simple at this point in time, this patch fixes the
problem by cloning the parent socket's LSM attributes to the newly created
child socket.  If we decide we need a more elaborate LSM marking mechanism
for Bluetooth (I somewhat doubt this) we can always revisit this decision
in the future.

Reported-by: James M. Cape 
Signed-off-by: Paul Moore 
Acked-by: James Morris 
Signed-off-by: David S. Miller

Bluetooth: rfcomm: Fix sleep in invalid context in rfcomm_security_cfm

2011-10-14T18:04:54+00:00

This was triggered by turning off encryption on ACL link when rfcomm
was using high security. rfcomm_security_cfm (which is called from rx
task) was closing DLC and this involves sending disconnect message
(and locking socket).

Move closing DLC to rfcomm_process_dlcs and only flag DLC for closure
in rfcomm_security_cfm.

BUG: sleeping function called from invalid context at net/core/sock.c:2032
in_atomic(): 1, irqs_disabled(): 0, pid: 1788, name: kworker/0:3
[] (unwind_backtrace+0x0/0x108) from [] (dump_stack+0x20/0x24)
[] (dump_stack+0x20/0x24) from [] (__might_sleep+0x110/0x12c)
[] (__might_sleep+0x110/0x12c) from [] (lock_sock_nested+0x2c/0x64)
[] (lock_sock_nested+0x2c/0x64) from [] (l2cap_sock_sendmsg+0x58/0xcc)
[] (l2cap_sock_sendmsg+0x58/0xcc) from [] (sock_sendmsg+0xb0/0xd0)
[] (sock_sendmsg+0xb0/0xd0) from [] (kernel_sendmsg+0x3c/0x44)
[] (kernel_sendmsg+0x3c/0x44) from [] (rfcomm_send_frame+0x50/0x58)
[] (rfcomm_send_frame+0x50/0x58) from [] (rfcomm_send_disc+0x78/0x80)
[] (rfcomm_send_disc+0x78/0x80) from [] (__rfcomm_dlc_close+0x2d0/0x2fc)
[] (__rfcomm_dlc_close+0x2d0/0x2fc) from [] (rfcomm_security_cfm+0x140/0x1e0)
[] (rfcomm_security_cfm+0x140/0x1e0) from [] (hci_event_packet+0x1ce8/0x4d84)
[] (hci_event_packet+0x1ce8/0x4d84) from [] (hci_rx_task+0x1d0/0x2d0)
[] (hci_rx_task+0x1d0/0x2d0) from [] (tasklet_action+0x138/0x1e4)
[] (tasklet_action+0x138/0x1e4) from [] (__do_softirq+0xcc/0x274)
[] (__do_softirq+0xcc/0x274) from [] (do_softirq+0x60/0x6c)
[] (do_softirq+0x60/0x6c) from [] (local_bh_enable_ip+0xc8/0xd4)
[] (local_bh_enable_ip+0xc8/0xd4) from [] (_raw_spin_unlock_bh+0x48/0x4c)
[] (_raw_spin_unlock_bh+0x48/0x4c) from [] (data_from_chip+0xf4/0xaec)
[] (data_from_chip+0xf4/0xaec) from [] (send_skb_to_core+0x40/0x178)
[] (send_skb_to_core+0x40/0x178) from [] (cg2900_hu_receive+0x15c/0x2d0)
[] (cg2900_hu_receive+0x15c/0x2d0) from [] (hci_uart_tty_receive+0x74/0xa0)
[] (hci_uart_tty_receive+0x74/0xa0) from [] (flush_to_ldisc+0x188/0x198)
[] (flush_to_ldisc+0x188/0x198) from [] (process_one_work+0x144/0x4b8)
[] (process_one_work+0x144/0x4b8) from [] (worker_thread+0x198/0x468)
[] (worker_thread+0x198/0x468) from [] (kthread+0x98/0xa0)
[] (kthread+0x98/0xa0) from [] (kernel_thread_exit+0x0/0x8)

Signed-off-by: Szymon Janc 
Signed-off-by: Gustavo F. Padovan

Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem

2011-10-11T19:35:42+00:00

Conflicts:
	Documentation/feature-removal-schedule.txt