Commit 43861da7 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'for-upstream' of... 

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



Johan Hedberg says:

====================
pull request: bluetooth-next 2020-03-19

Here's the main bluetooth-next pull request for the 5.7 kernel.

 - Added wideband speech support to mgmt and the ability for HCI drivers
   to declare support for it.
 - Added initial support for L2CAP Enhanced Credit Based Mode
 - Fixed suspend handling for several use cases
 - Fixed Extended Advertising related issues
 - Added support for Realtek 8822CE device
 - Added DT bindings for QTI chip WCN3991
 - Cleanups to replace zero-length arrays with flexible-array members
 - Several other smaller cleanups & fixes
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ab9d1e17 ba7c1b47

Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ Optional properties for compatible string qcom,wcn399x-bt: 


 - max-speed: see Documentation/devicetree/bindings/serial/slave-device.txt

 - firmware-name: specify the name of nvm firmware to load

 - clocks: clock provided to the controller



Examples:
@@ -57,5 +58,6 @@ serial@898000 { 
		vddch0-supply = <&vreg_l25a_3p3>;

		max-speed = <3200000>;

		firmware-name = "crnv21.bin";

		clocks = <&rpmhcc RPMH_RF_CLK2>;

	};

};

Documentation/networking/6lowpan.txt→Documentation/networking/6lowpan.rst

+16 −13
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0



Netdev private dataroom for 6lowpan interfaces:

==============================================

Netdev private dataroom for 6lowpan interfaces

==============================================



All 6lowpan able net devices, means all interfaces with ARPHRD_6LOWPAN,

must have "struct lowpan_priv" placed at beginning of netdev_priv.



The priv_size of each interface should be calculate by:

The priv_size of each interface should be calculate by::



 dev->priv_size = LOWPAN_PRIV_SIZE(LL_6LOWPAN_PRIV_DATA);



Where LL_PRIV_6LOWPAN_DATA is sizeof linklayer 6lowpan private data struct.

To access the LL_PRIV_6LOWPAN_DATA structure you can cast:

To access the LL_PRIV_6LOWPAN_DATA structure you can cast::



 lowpan_priv(dev)-priv;



to your LL_6LOWPAN_PRIV_DATA structure.



Before registering the lowpan netdev interface you must run:

Before registering the lowpan netdev interface you must run::



 lowpan_netdev_setup(dev, LOWPAN_LLTYPE_FOOBAR);



wheres LOWPAN_LLTYPE_FOOBAR is a define for your 6LoWPAN linklayer type of

enum lowpan_lltypes.



Example to evaluate the private usually you can do:

Example to evaluate the private usually you can do::



 static inline struct lowpan_priv_foobar *

 lowpan_foobar_priv(struct net_device *dev)

Documentation/networking/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ Contents: 
   tls

   tls-offload

   nfc

   6lowpan



.. only::  subproject and html

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ L: linux-wpan@vger.kernel.org 
S:	Maintained

F:	net/6lowpan/

F:	include/net/6lowpan.h

F:	Documentation/networking/6lowpan.txt

F:	Documentation/networking/6lowpan.rst















6PACK NETWORK DRIVER FOR AX.25















M:	Andreas Koensgen <ajk@comnets.uni-bremen.de>

































drivers/bluetooth/Kconfig



+2
−2






























Original line number
Diff line number
Diff line








@@ -211,12 +211,12 @@ config BT_HCIUART_RTL













	depends on BT_HCIUART















	depends on BT_HCIUART_SERDEV















	depends on GPIOLIB













	depends on ACPI













	depends on (ACPI || SERIAL_DEV_CTRL_TTYPORT)















	select BT_HCIUART_3WIRE















	select BT_RTL















	help















	  The Realtek protocol support enables Bluetooth HCI over 3-Wire













	  serial port internface for Realtek Bluetooth controllers.













	  serial port interface for Realtek Bluetooth controllers.































	  Say Y here to compile support for Realtek protocol.

























































































CRA Git | Maintained and supported by SUSTech CRA and CCSE