litmus-rt.git/net/bluetooth/rfcomm, branch linux-tip

Bluetooth: fix not setting security level when creating a rfcomm session

2010-11-09T02:56:10+00:00

This cause 'No Bonding' to be used if userspace has not yet been paired
with remote device since the l2cap socket used to create the rfcomm
session does not have any security level set.

Signed-off-by: Luiz Augusto von Dentz 
Acked-by: Ville Tervo 
Acked-by: Marcel Holtmann 
Signed-off-by: Gustavo F. Padovan

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

2010-10-23T18:47:02+00:00

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1699 commits)
  bnx2/bnx2x: Unsupported Ethtool operations should return -EINVAL.
  vlan: Calling vlan_hwaccel_do_receive() is always valid.
  tproxy: use the interface primary IP address as a default value for --on-ip
  tproxy: added IPv6 support to the socket match
  cxgb3: function namespace cleanup
  tproxy: added IPv6 support to the TPROXY target
  tproxy: added IPv6 socket lookup function to nf_tproxy_core
  be2net: Changes to use only priority codes allowed by f/w
  tproxy: allow non-local binds of IPv6 sockets if IP_TRANSPARENT is enabled
  tproxy: added tproxy sockopt interface in the IPV6 layer
  tproxy: added udp6_lib_lookup function
  tproxy: added const specifiers to udp lookup functions
  tproxy: split off ipv6 defragmentation to a separate module
  l2tp: small cleanup
  nf_nat: restrict ICMP translation for embedded header
  can: mcp251x: fix generation of error frames
  can: mcp251x: fix endless loop in interrupt handler if CANINTF_MERRF is set
  can-raw: add msg_flags to distinguish local traffic
  9p: client code cleanup
  rds: make local functions/variables static
  ...

Fix up conflicts in net/core/dev.c, drivers/net/pcmcia/smc91c92_cs.c and
drivers/net/wireless/ath/ath9k/debug.c as per David

tty: icount changeover for other main devices

2010-10-22T17:20:05+00:00

Again basically cut and paste

Convert the main driver set to use the hooks for GICOUNT

Signed-off-by: Alan Cox 
Signed-off-by: Greg Kroah-Hartman

Bluetooth: clean up rfcomm code

2010-10-12T15:44:53+00:00

Remove dead code and unused rfcomm thread events

Signed-off-by: Andrei Emeltchenko 
Acked-by: Marcel Holtmann 
Signed-off-by: Gustavo F. Padovan

Bluetooth: make batostr() print in the right order

2010-10-12T15:44:52+00:00

The Bluetooth core uses the the BD_ADDR in the opposite order from the
human readable order. So we are changing batostr() to print in the
correct order and then removing some baswap(), as they are not needed
anymore.

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

Bluetooth: remove extra newline from debug output

2010-10-12T15:44:51+00:00

Signed-off-by: Andrei Emeltchenko 
Acked-by: Ville Tervo 
Acked-by: Marcel Holtmann 
Signed-off-by: Gustavo F. Padovan

Bluetooth: Use common SOCK_STREAM receive code in RFCOMM

2010-10-12T15:44:51+00:00

To reduce code duplication, have rfcomm_sock_recvmsg() call
bt_sock_stream_recvmsg().  The common bt_sock_stream_recvmsg()
code is nearly identical, with the RFCOMM-specific functionality
for deferred setup and connection unthrottling left in
rfcomm_sock_recvmsg().

Signed-off-by: Mat Martineau 
Acked-by: Marcel Holtmann 
Signed-off-by: Gustavo F. Padovan

Bluetooth: Fix RFCOMM RPN negotiation

2010-10-12T15:44:51+00:00

According to the ETSI 3GPP TS 07.10 the default bit rate value for RFCOMM
is 9600 bit/s. Return this bit rate in case of RPN request and accept other
sane bit rates proposed by the sender in RPM command.

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

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

2010-10-11T19:30:34+00:00

Conflicts:
	net/core/ethtool.c

Bluetooth: Fix inconsistent lock state with RFCOMM

2010-09-30T15:19:35+00:00

When receiving a rfcomm connection with the old dund deamon a
inconsistent lock state happens. That's because interrupts were already
disabled by l2cap_conn_start() when rfcomm_sk_state_change() try to lock
the spin_lock.

As result we may have a inconsistent lock state for l2cap_conn_start()
after rfcomm_sk_state_change() calls bh_lock_sock() and disable interrupts
as well.

[ 2833.151999]
[ 2833.151999] =================================
[ 2833.151999] [ INFO: inconsistent lock state ]
[ 2833.151999] 2.6.36-rc3 #2
[ 2833.151999] ---------------------------------
[ 2833.151999] inconsistent {IN-SOFTIRQ-W} -> {SOFTIRQ-ON-W} usage.
[ 2833.151999] krfcommd/2306 [HC0[0]:SC0[0]:HE1:SE1] takes:
[ 2833.151999]  (slock-AF_BLUETOOTH){+.?...}, at: [] rfcomm_sk_state_change+0x46/0x170 [rfcomm]
[ 2833.151999] {IN-SOFTIRQ-W} state was registered at:
[ 2833.151999]   [] __lock_acquire+0x5b6/0x1560
[ 2833.151999]   [] lock_acquire+0x5a/0x70
[ 2833.151999]   [] _raw_spin_lock+0x2c/0x40
[ 2833.151999]   [] l2cap_conn_start+0x92/0x640 [l2cap]
[ 2833.151999]   [] l2cap_sig_channel+0x6bf/0x1320 [l2cap]
[ 2833.151999]   [] l2cap_recv_frame+0x133/0x770 [l2cap]
[ 2833.151999]   [] l2cap_recv_acldata+0x1cb/0x390 [l2cap]
[ 2833.151999]   [] hci_rx_task+0x2ab/0x450 [bluetooth]
[ 2833.151999]   [] tasklet_action+0xcb/0xe0
[ 2833.151999]   [] __do_softirq+0xae/0x150
[ 2833.151999]   [] call_softirq+0x1c/0x30
[ 2833.151999]   [] do_softirq+0x75/0xb0
[ 2833.151999]   [] irq_exit+0x8d/0xa0
[ 2833.151999]   [] smp_apic_timer_interrupt+0x6b/0xa0
[ 2833.151999]   [] apic_timer_interrupt+0x13/0x20
[ 2833.151999]   [] cpu_idle+0x5a/0xb0
[ 2833.151999]   [] rest_init+0xad/0xc0
[ 2833.151999]   [] start_kernel+0x2dd/0x2e8
[ 2833.151999]   [] x86_64_start_reservations+0xf6/0xfa
[ 2833.151999]   [] x86_64_start_kernel+0xe4/0xeb
[ 2833.151999] irq event stamp: 731
[ 2833.151999] hardirqs last  enabled at (731): [] local_bh_enable_ip+0x82/0xe0
[ 2833.151999] hardirqs last disabled at (729): [] __do_softirq+0xce/0x150
[ 2833.151999] softirqs last  enabled at (730): [] __do_softirq+0xfe/0x150
[ 2833.151999] softirqs last disabled at (711): [] call_softirq+0x1c/0x30
[ 2833.151999]
[ 2833.151999] other info that might help us debug this:
[ 2833.151999] 2 locks held by krfcommd/2306:
[ 2833.151999]  #0:  (rfcomm_mutex){+.+.+.}, at: [] rfcomm_run+0x174/0xb20 [rfcomm]
[ 2833.151999]  #1:  (&(&d->lock)->rlock){+.+...}, at: [] rfcomm_dlc_accept+0x53/0x100 [rfcomm]
[ 2833.151999]
[ 2833.151999] stack backtrace:
[ 2833.151999] Pid: 2306, comm: krfcommd Tainted: G        W   2.6.36-rc3 #2
[ 2833.151999] Call Trace:
[ 2833.151999]  [] print_usage_bug+0x171/0x180
[ 2833.151999]  [] mark_lock+0x333/0x400
[ 2833.151999]  [] __lock_acquire+0x63a/0x1560
[ 2833.151999]  [] ? __lock_acquire+0xb25/0x1560
[ 2833.151999]  [] lock_acquire+0x5a/0x70
[ 2833.151999]  [] ? rfcomm_sk_state_change+0x46/0x170 [rfcomm]
[ 2833.151999]  [] _raw_spin_lock+0x2c/0x40
[ 2833.151999]  [] ? rfcomm_sk_state_change+0x46/0x170 [rfcomm]
[ 2833.151999]  [] rfcomm_sk_state_change+0x46/0x170 [rfcomm]
[ 2833.151999]  [] rfcomm_dlc_accept+0x69/0x100 [rfcomm]
[ 2833.151999]  [] rfcomm_check_accept+0x59/0xd0 [rfcomm]
[ 2833.151999]  [] rfcomm_recv_frame+0x9fb/0x1320 [rfcomm]
[ 2833.151999]  [] ? _raw_spin_unlock_irqrestore+0x3b/0x60
[ 2833.151999]  [] ? trace_hardirqs_on_caller+0x13d/0x180
[ 2833.151999]  [] ? trace_hardirqs_on+0xd/0x10
[ 2833.151999]  [] rfcomm_run+0x221/0xb20 [rfcomm]
[ 2833.151999]  [] ? schedule+0x287/0x780
[ 2833.151999]  [] ? rfcomm_run+0x0/0xb20 [rfcomm]
[ 2833.151999]  [] kthread+0x96/0xa0
[ 2833.151999]  [] kernel_thread_helper+0x4/0x10
[ 2833.151999]  [] ? restore_args+0x0/0x30
[ 2833.151999]  [] ? kthread+0x0/0xa0
[ 2833.151999]  [] ? kernel_thread_helper+0x0/0x10

Signed-off-by: Gustavo F. Padovan