linux-stable.git/net/bluetooth/bnep, branch linux-3.3.y

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

2012-01-03T20:16:34+00:00

Conflicts:
	drivers/net/wireless/b43/dma.c
	drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c

Bluetooth: Always compile SCO and L2CAP in Bluetooth Core

2011-12-21T04:21:08+00:00

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

module_param: make bool parameters really bool (net & drivers/net)

2011-12-20T03:27:29+00:00

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

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

2011-12-02T23:26:25+00:00

Bluetooth: bnep: Fix module reference

2011-11-21T16:29:25+00:00

We cannot call module_put(THIS_MODULE) if this is our last reference. Otherwise,
this call may cleanup our module before it returns.

Gladly, the kthread API provides a simple wrapper for us. So lets use
module_put_and_exit() to avoid a race condition with the module cleanup code.

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

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

2011-11-09T19:54:33+00:00

Conflicts:
	net/bluetooth/l2cap_sock.c
	net/bluetooth/mgmt.c

Bluetooth: replace list_for_each with list_for_each_entry whenever possible

2011-11-07T19:24:46+00:00

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

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

Bluetooth: Linearize skbs for use in BNEP, CMTP, HIDP, and RFCOMM

2011-09-27T21:15:55+00:00

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

Merge branch 'master' of github.com:davem330/net

2011-09-22T07:23:13+00:00

Conflicts:
	MAINTAINERS
	drivers/net/Kconfig
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
	drivers/net/ethernet/broadcom/tg3.c
	drivers/net/wireless/iwlwifi/iwl-pci.c
	drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/wl12xx/main.c