10 Nov, 2011
2 commits
-
…ireless into for-davem
08 Nov, 2011
2 commits
-
Timers set by __set_chan_timer() should use miliseconds instead of
jiffies. Commit 942ecc9c4643db5ce071562e0a23f99464d6b461 updated
l2cap_set_timer() so it expects timeout to be specified in msecs
instead of jiffies. This makes timeouts unreliable when CONFIG_HZ
is not set to 1000.Signed-off-by: Andrzej Kaczmarek
Signed-off-by: Gustavo F. Padovan -
* 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
...
07 Nov, 2011
1 commit
-
* 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
Revert "tracing: Include module.h in define_trace.h"
irq: don't put module.h into irq.h for tracking irqgen modules.
bluetooth: macroize two small inlines to avoid module.h
ip_vs.h: fix implicit use of module_get/module_put from module.h
nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
include: replace linux/module.h with "struct module" wherever possible
include: convert various register fcns to macros to avoid include chaining
crypto.h: remove unused crypto_tfm_alg_modname() inline
uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
pm_runtime.h: explicitly requires notifier.h
linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
miscdevice.h: fix up implicit use of lists and types
stop_machine.h: fix implicit use of smp.h for smp_processor_id
of: fix implicit use of errno.h in include/linux/of.h
of_platform.h: delete needless include
acpi: remove module.h include from platform/aclinux.h
miscdevice.h: delete unnecessary inclusion of module.h
device_cgroup.h: delete needless include
net: sch_generic remove redundant use of
net: inet_timewait_sock doesnt need
...Fix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in
- drivers/media/dvb/frontends/dibx000_common.c
- drivers/media/video/{mt9m111.c,ov6650.c}
- drivers/mfd/ab3550-core.c
- include/linux/dmaengine.h
05 Nov, 2011
1 commit
-
…wireless into for-davem
03 Nov, 2011
1 commit
01 Nov, 2011
2 commits
-
Standardize the style for compiler based printf format verification.
Standardized the location of __printf too.Done via script and a little typing.
$ grep -rPl --include=*.[ch] -w "__attribute__" * | \
grep -vP "^(tools|scripts|include/linux/compiler-gcc.h)" | \
xargs perl -n -i -e 'local $/; while (<>) { s/\b__attribute__\s*\(\s*\(\s*format\s*\(\s*printf\s*,\s*(.+)\s*,\s*(.+)\s*\)\s*\)\s*\)/__printf($1, $2)/g ; print; }'[akpm@linux-foundation.org: revert arch bits]
Signed-off-by: Joe Perches
Cc: "Kirill A. Shutemov"
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
These two small inlines make calls to try_module_get() and
module_put() which would force us to keep module.h present
within yet another common include header. We can avoid this
by turning them into macros. The hci_dev_hold construct
is patterned off of raw_spin_trylock_irqsave() in spinlock.hSigned-off-by: Paul Gortmaker
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
-
Use sk_buff fragment capabilities to link together incoming skbs
instead of allocating a new skb for reassembly and copying.The new reassembly code works equally well for ERTM and streaming
mode, so there is now one reassembly function instead of two.Signed-off-by: Mat Martineau
Signed-off-by: Gustavo F. Padovan
21 Sep, 2011
8 commits
-
Add management interface events for blocking/unblocking a device.
Sender of the block device command gets cmd complete and other
mgmt sockets get the event. Event is also sent to mgmt sockets when
blocking is done with ioctl, e.g when blocking a device with
hciconfig. This makes it possible for bluetoothd to track status
of blocked devices when a third party block or unblocks a device.Event sending is handled in mgmt_device_blocked function which gets
called from hci_blacklist_add in hci_core.c. A pending command is
added in mgmt_block_device, so that it can found when sending the
event - the event is not sent to the socket from which the pending
command came. Locks were moved out from hci_core.c to hci_sock.c
and mgmt.c, because locking is needed also for mgmt_pending_add in
mgmt.c.Signed-off-by: Antti Julku
Signed-off-by: Gustavo F. Padovan -
The function crypto_blkcipher_setkey() called by smp_e()
can sleep, so all the crypto work has to be moved to
hci_dev workqueue.Signed-off-by: Vinicius Costa Gomes
Signed-off-by: Gustavo F. Padovan -
The objective is to make the core to have as little as possible
information about SMP procedures and logic. Now, all the SMP
specific information is hidden from the core.Signed-off-by: Vinicius Costa Gomes
Signed-off-by: Gustavo F. Padovan -
Add command to management interface for enabling/disabling the
fast connectable mode.Signed-off-by: Antti Julku
Signed-off-by: Gustavo F. Padovan -
One piece of information that was lost when using the mgmt interface,
was the type of the connection. Using HCI events we used to know
the type of the connection based on the type of the event, e.g.
HCI_LE_Connection_Complete for LE links.Signed-off-by: Vinicius Costa Gomes
Signed-off-by: Gustavo F. Padovan -
Signed-off-by: Vinicius Costa Gomes
Signed-off-by: Gustavo F. Padovan -
Add HCI_CONN_LE_SMP_PEND flag to indicate that SMP is pending
for that connection. This allows to have information that an SMP
procedure is going on for that connection.We use the HCI_CONN_ENCRYPT_PEND to indicate that encryption
(HCI_LE_Start_Encryption) is pending for that connection.While a SMP procedure is going on we hold an reference to the
connection, to avoid disconnections.Signed-off-by: Vinicius Costa Gomes
Signed-off-by: Gustavo F. Padovan -
This checks if there is any existing connection according to its type
before start iterating in the list and immediately stop iterating when
reaching the number of connections.Signed-off-by: Luiz Augusto von Dentz
Signed-off-by: Gustavo F. Padovan
15 Jul, 2011
1 commit
-
…wireless-next-2.6 into for-davem
Conflicts:
net/bluetooth/l2cap_core.c
11 Jul, 2011
1 commit
-
There can 3 reasons for the "command reject" reply produced
by the stack. Each such reply should be accompanied by the
relevand data ( as defined in spec. ). Currently there is one
instance of "command reject" reply with reason "invalid cid"
wich is fixed. Also, added clean-up definitions related to the
"command reject" replies.Signed-off-by: Ilia Kolomisnky
Signed-off-by: Gustavo F. Padovan
09 Jul, 2011
6 commits
-
This will be useful when userspace wants to restrict some kinds of
operations based on the length of the key size used to encrypt the
link.Signed-off-by: Vinicius Costa Gomes
Signed-off-by: Gustavo F. Padovan -
In some cases it will be useful having the key size used for
encrypting the link. For example, some profiles may restrict
some operations depending on the key length.The key size is stored in the key that is passed to userspace
using the pin_length field in the key structure.For now this field is only valid for LE controllers. 3.0+HS
controllers define the Read Encryption Key Size command, this
field is intended for storing the value returned by that
command.Signed-off-by: Vinicius Costa Gomes
Signed-off-by: Gustavo F. Padovan -
Signed-off-by: Vinicius Costa Gomes
Signed-off-by: Gustavo F. Padovan -
As the LTK (the new type of key being handled now) has more data
associated with it, we need to store this extra data and retrieve
the keys based on that data.Methods for searching for a key and for adding a new LTK are
introduced here.Signed-off-by: Vinicius Costa Gomes
Signed-off-by: Gustavo F. Padovan -
We need these changes because SMP keys may have more information
associated with them, for example, in the LTK case, it has an
encrypted diversifier (ediv) and a random number (rand).Signed-off-by: Vinicius Costa Gomes
Signed-off-by: Gustavo F. Padovan -
This adds support for generating and distributing all the keys
specified in the third phase of SMP.This will make possible to re-establish secure connections, resolve
private addresses and sign commands.For now, the values generated are random.
Signed-off-by: Vinicius Costa Gomes
Signed-off-by: Gustavo F. Padovan
08 Jul, 2011
2 commits
-
The ERTM receive buffer is now handled in a way that does not require
the busy queue and the associated polling code.Signed-off-by: Mat Martineau
Signed-off-by: Gustavo F. Padovan -
This change moves most L2CAP ERTM receive buffer handling out of the
L2CAP core and in to the socket code. It's up to the higher layer
(the socket code, in this case) to tell the core when its buffer is
full or has space available. The recv op should always accept
incoming ERTM data or else the connection will go down.Within the socket layer, an skb that does not fit in the socket
receive buffer will be temporarily stored. When the socket is read
from, that skb will be placed in the receive buffer if possible. Once
adequate buffer space becomes available, the L2CAP core is informed
and the ERTM local busy state is cleared.Receive buffer management for non-ERTM modes is unchanged.
Signed-off-by: Mat Martineau
Signed-off-by: Gustavo F. Padovan
07 Jul, 2011
4 commits
-
Since we have the extended LMP features properly implemented, we
should check the LMP_HOST_LE bit to know if the host supports LE.Signed-off-by: Andre Guedes
Signed-off-by: Gustavo F. Padovan -
This patch adds a new module parameter to enable/disable host LE
support. By default host LE support is disabled.Signed-off-by: Andre Guedes
Signed-off-by: Gustavo F. Padovan -
This patch adds a handler to Write LE Host Supported command complete
events. Once this commands has completed successfully, we should
read the extended LMP features and update the extfeatures field in
hci_dev.Signed-off-by: Andre Guedes
Signed-off-by: Gustavo F. Padovan -
This new field holds the extended LMP features value. Some LE
mechanism such as discovery procedure needs to read the extended
LMP features to work properly.Signed-off-by: Andre Guedes
Signed-off-by: Gustavo F. Padovan
02 Jul, 2011
1 commit
-
priv and lock are never used
Signed-off-by: Gustavo F. Padovan
01 Jul, 2011
2 commits
-
Add a local logging function to emit bluetooth specific
messages. Using vsprintf extension %pV saves code/text
space.Convert the current BT_INFO and BT_ERR macros to use bt_printk.
Remove __func__ from BT_ERR macro (and the uses).
Prefix "Bluetooth: " to BT_ERR
Remove __func__ from BT_DBG as function can be prefixed when
using dynamic_debug.With allyesconfig:
text data bss dec hex filename
129956 8632 36096 174684 2aa5c drivers/bluetooth/built-in.o.new2
134402 8632 36064 179098 2bb9a drivers/bluetooth/built-in.o.old
14778 1012 3408 19198 4afe net/bluetooth/bnep/built-in.o.new2
15067 1012 3408 19487 4c1f net/bluetooth/bnep/built-in.o.old
346595 19163 86080 451838 6e4fe net/bluetooth/built-in.o.new2
353751 19163 86064 458978 700e2 net/bluetooth/built-in.o.old
18483 1172 4264 23919 5d6f net/bluetooth/cmtp/built-in.o.new2
18927 1172 4264 24363 5f2b net/bluetooth/cmtp/built-in.o.old
19237 1172 5152 25561 63d9 net/bluetooth/hidp/built-in.o.new2
19581 1172 5152 25905 6531 net/bluetooth/hidp/built-in.o.old
59461 3884 14464 77809 12ff1 net/bluetooth/rfcomm/built-in.o.new2
61206 3884 14464 79554 136c2 net/bluetooth/rfcomm/built-in.o.oldwith x86 defconfig (and just bluetooth):
$ size net/bluetooth/built-in.o.defconfig.*
text data bss dec hex filename
66358 933 100 67391 1073f net/bluetooth/built-in.o.defconfig.new
66643 933 100 67676 1085c net/bluetooth/built-in.o.defconfig.oldSigned-off-by: Joe Perches
Signed-off-by: Gustavo F. Padovan -
Make it easier to use more normal logging styles later.
Signed-off-by: Joe Perches
Signed-off-by: Gustavo F. Padovan
25 Jun, 2011
1 commit
-
…wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/rtlwifi/pci.c
include/linux/netlink.h
17 Jun, 2011
3 commits
-
Instead of setting bits manually we use set_bit, test_bit, etc.
Also remove L2CAP_ prefix from macros.Signed-off-by: Gustavo F. Padovan
-
Instead of making the bit operations manually, we now use set_bit,
test_bit, etc.Signed-off-by: Gustavo F. Padovan
-
Management interface commands for blocking and unblocking devices.
Signed-off-by: Antti Julku
Signed-off-by: Gustavo F. Padovan