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

2019-04-08 23:39:36 -07:00
parent 7f301cff1f 869e3305f2
commit 310655b07a
146 changed files with 1474 additions and 1105 deletions
--- a/include/net/nfc/nci_core.h
+++ b/include/net/nfc/nci_core.h
@@ -166,7 +166,7 @@ struct nci_conn_info {
 * According to specification 102 622 chapter 4.4 Pipes,
 * the pipe identifier is 7 bits long.
 */
-#define NCI_HCI_MAX_PIPES          127
+#define NCI_HCI_MAX_PIPES          128

 struct nci_hci_gate {
 	u8 gate;