11 Jan, 2012
1 commit
04 Jan, 2012
1 commit
-
…wireless-next into for-davem
Conflicts:
drivers/net/wireless/b43/dma.c
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
03 Jan, 2012
2 commits
-
We now run in process context, no need to disable interrupts.
Calls from the tty layer also run in process context.rw_lock was converted to spinlock, we have more writers than readers in
this case.Acked-by: Marcel Holtmann
Signed-off-by: Gustavo F. Padovan -
Code now run in process context, does not need to disable interrupt
anymore.Acked-by: Marcel Holtmann
Signed-off-by: Gustavo F. Padovan
28 Dec, 2011
1 commit
-
sock and sk were leftover from another change.
Signed-off-by: Gustavo F. Padovan
24 Dec, 2011
1 commit
-
Conflicts:
net/bluetooth/l2cap_core.cJust two overlapping changes, one added an initialization of
a local variable, and another change added a new local variable.Signed-off-by: David S. Miller
23 Dec, 2011
1 commit
-
RFCOMM needs a proper priority mechanism inside itself and not try to use
l2cap priority to fix its own problem.Acked-by: Marcel Holtmann
Signed-off-by: Gustavo F. Padovan
21 Dec, 2011
1 commit
-
The handling of SCO audio links and the L2CAP protocol are essential to
any system with Bluetooth thus are always compiled in from now on.Signed-off-by: Ulisses Furquim
Acked-by: Marcel Holtmann
Signed-off-by: Gustavo F. Padovan
20 Dec, 2011
1 commit
-
module_param(bool) used to counter-intuitively take an int. In
fddd5201 (mid-2009) we allowed bool or int/unsigned int using a messy
trick.It's time to remove the int/unsigned int option. For this version
it'll simply give a warning, but it'll break next kernel version.(Thanks to Joe Perches for suggesting coccinelle for 0/1 -> true/false).
Cc: "David S. Miller"
Cc: netdev@vger.kernel.org
Signed-off-by: Rusty Russell
Signed-off-by: David S. Miller
19 Dec, 2011
2 commits
-
Conflicts:
net/bluetooth/l2cap_core.c -
When the last RFCOMM data channel is closed, a timer is normally set
up to disconnect the control channel at a later time. If the control
channel disconnect command is sent with the timer pending, the timer
needs to be cancelled.If the timer is not cancelled in this situation, the reference
counting logic for the RFCOMM session does not work correctly when the
remote device closes the L2CAP connection. The session is freed at
the wrong time, leading to a kernel panic.Signed-off-by: Mat Martineau
Acked-by: Marcel Holtmann
Signed-off-by: Gustavo F. Padovan
10 Nov, 2011
1 commit
-
Conflicts:
net/bluetooth/l2cap_sock.c
net/bluetooth/mgmt.c
08 Nov, 2011
5 commits
-
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 -
Signed-off-by: Luiz Augusto von Dentz
Signed-off-by: Gustavo F. Padovan -
When all items in the list have the same type there is no much of a point
to use list_for_each except if you want to use the list pointer itself.Signed-off-by: Luiz Augusto von Dentz
Signed-off-by: Gustavo F. Padovan -
Remove old tasklets and replace by workqueue. To avoid reentrancy (which
tasklets always avoid) we use the system_nrt_wq.Signed-off-by: David Herrmann
Signed-off-by: Gustavo F. Padovan -
Forward error codes from tty core to the rfcomm_init caller instead of using
generic -1 errors.Signed-off-by: David Herrmann
Signed-off-by: Gustavo F. Padovan
03 Nov, 2011
1 commit
25 Oct, 2011
1 commit
19 Oct, 2011
1 commit
-
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
15 Oct, 2011
1 commit
-
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
28 Sep, 2011
1 commit
-
Fragmented skbs are only encountered when receiving ERTM or streaming
mode L2CAP data. BNEP, CMTP, HIDP, and RFCOMM generally use basic
mode, but they need to handle fragments without crashing.Signed-off-by: Mat Martineau
Signed-off-by: Gustavo F. Padovan
12 Aug, 2011
2 commits
-
Fix race conditions which can cause lost wakeups (or missed
signals) while waiting to accept an rfcomm socket connection.Signed-off-by: Peter Hurley
Signed-off-by: Gustavo F. Padovan -
Removed superfluous event handling which was used to signal
that the rfcomm kthread had been woken. This appears to have been
used to prevent lost wakeups. Correctly ordering when the task
state is set to TASK_INTERRUPTIBLE is sufficient to prevent lost wakeups.To prevent wakeups which occurred prior to initially setting
TASK_INTERRUPTIBLE from being lost, the main work of the thread loop -
rfcomm_process_sessions() - is performed prior to sleeping.Signed-off-by: Peter Hurley
Signed-off-by: Gustavo F. Padovan
10 Jun, 2011
3 commits
-
Conflicts:
net/bluetooth/rfcomm/sock.c -
Enabling DEBUG_STRICT_USER_COPY_CHECKS causes the following
warning:In function 'copy_from_user',
inlined from 'rfcomm_sock_setsockopt' at
net/bluetooth/rfcomm/sock.c:705:
arch/x86/include/asm/uaccess_64.h:65:
warning: call to 'copy_from_user_overflow' declared with
attribute warning: copy_from_user() buffer size is not provably
correctpresumably due to buf_size being signed causing GCC to fail to
see that buf_size can't become negative.Cc: Marcel Holtmann
Cc: Gustavo F. Padovan
Signed-off-by: Stephen Boyd
Signed-off-by: Gustavo F. Padovan -
Structures "l2cap_conninfo" and "rfcomm_conninfo" have one padding
byte each. This byte in "cinfo" is copied to userspace uninitialized.Signed-off-by: Filip Palian
Acked-by: Marcel Holtmann
Signed-off-by: Gustavo F. Padovan
09 Jun, 2011
1 commit
-
Signed-off-by: David S. Miller
Signed-off-by: Gustavo F. Padovan
12 May, 2011
1 commit
-
In case of pre v2.1 devices authentication request will return
success immediately if the link key already exists without any
authentication process.That means, it's not possible to re-authenticate the link if you
already have combination key and for instance want to re-authenticate
to get the high security (use 16 digit pin).Therefore, it's necessary to check security requirements on auth
complete event to prevent not enough secure connection.Signed-off-by: Waldemar Rymarkiewicz
Signed-off-by: Gustavo F. Padovan
28 Apr, 2011
3 commits
-
There is no need to the socket deal directly with the channel, most of the
time it cares about the channel only.Signed-off-by: Gustavo F. Padovan
-
In this commit, omtu, imtu, flush_to, mode and sport. It also remove the
pi var from l2cap_sock_sendmsg().Signed-off-by: Gustavo F. Padovan
-
In this commit all ERTM and Streaming Mode specific vars.
Signed-off-by: Gustavo F. Padovan
17 Mar, 2011
2 commits
-
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1480 commits)
bonding: enable netpoll without checking link status
xfrm: Refcount destination entry on xfrm_lookup
net: introduce rx_handler results and logic around that
bonding: get rid of IFF_SLAVE_INACTIVE netdev->priv_flag
bonding: wrap slave state work
net: get rid of multiple bond-related netdevice->priv_flags
bonding: register slave pointer for rx_handler
be2net: Bump up the version number
be2net: Copyright notice change. Update to Emulex instead of ServerEngines
e1000e: fix kconfig for crc32 dependency
netfilter ebtables: fix xt_AUDIT to work with ebtables
xen network backend driver
bonding: Improve syslog message at device creation time
bonding: Call netif_carrier_off after register_netdevice
bonding: Incorrect TX queue offset
net_sched: fix ip_tos2prio
xfrm: fix __xfrm_route_forward()
be2net: Fix UDP packet detected status in RX compl
Phonet: fix aligned-mode pipe socket buffer header reserve
netxen: support for GbE port settings
...Fix up conflicts in drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
with the staging updates. -
* 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (76 commits)
pch_uart: reference clock on CM-iTC
pch_phub: add new device ML7213
n_gsm: fix UIH control byte : P bit should be 0
n_gsm: add a documentation
serial: msm_serial_hs: Add MSM high speed UART driver
tty_audit: fix tty_audit_add_data live lock on audit disabled
tty: move cd1865.h to drivers/staging/tty/
Staging: tty: fix build with epca.c driver
pcmcia: synclink_cs: fix prototype for mgslpc_ioctl()
Staging: generic_serial: fix double locking bug
nozomi: don't use flush_scheduled_work()
tty/serial: Relax the device_type restriction from of_serial
MAINTAINERS: Update HVC file patterns
tty: phase out of ioctl file pointer for tty3270 as well
tty: forgot to remove ipwireless from drivers/char/pcmcia/Makefile
pch_uart: Fix DMA channel miss-setting issue.
pch_uart: fix exclusive access issue
pch_uart: fix auto flow control miss-setting issue
pch_uart: fix uart clock setting issue
pch_uart : Use dev_xxx not pr_xxx
...Fix up trivial conflicts in drivers/misc/pch_phub.c (same patch applied
twice, then changes to the same area in one branch)
19 Feb, 2011
1 commit
-
Conflicts:
drivers/bluetooth/ath3k.c
drivers/bluetooth/btusb.c
18 Feb, 2011
3 commits
-
Only oddities here are a couple of drivers that bogusly called the ldisc
helpers instead of returning -ENOIOCTLCMD. Fix the bug and the rest goes
away.Signed-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman -
Doing tiocmget was such fun we should do tiocmset as well for the same
reasonsSigned-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman -
We don't actually need this and it causes problems for internal use of
this functionality. Currently there is a single use of the FILE * pointer.
That is the serial core which uses it to check tty_hung_up_p. However if
that is true then IO_ERROR is also already set so the check may be removed.Signed-off-by: Alan Cox
Signed-off-by: Greg Kroah-Hartman
17 Feb, 2011
1 commit
-
Signed-off-by: Vladislav P
Signed-off-by: Gustavo F. Padovan
15 Feb, 2011
1 commit
-
l2cap_load() was added to trigger l2cap.ko module loading from the RFCOMM
and BNEP modules. Now that L2CAP module is gone, we don't need it anymore.Signed-off-by: Gustavo F. Padovan