linux-kernel - linux-next: manual merge of the tty tree with the bluetooth tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20110426175530.d27179e2.sfr@canb.auug.org.au>
Date:	Tue, 26 Apr 2011 17:55:30 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jiejing Zhang <kzjeef@...il.com>,
	"Gustavo F. Padovan" <padovan@...fusion.mobi>,
	Felipe Balbi <balbi@...com>
Subject: linux-next: manual merge of the tty tree with the bluetooth tree

Hi Greg,

Today's linux-next merge of the tty tree got a conflict in
drivers/bluetooth/hci_ldisc.c between commit 78b4a56c28c0 ("Bluetooth:
hci_uart: check the return value of recv()") from the bluetooth tree and
commit b1c43f82c5aa ("tty: make receive_buf() return the amout of bytes
received") from the tty tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/bluetooth/hci_ldisc.c
index 320f718,0d4da5e..0000000
--- a/drivers/bluetooth/hci_ldisc.c
+++ b/drivers/bluetooth/hci_ldisc.c
@@@ -357,21 -357,21 +357,22 @@@ static void hci_uart_tty_wakeup(struct 
   *     
   * Return Value:    None
   */
- static void hci_uart_tty_receive(struct tty_struct *tty, const u8 *data, char *flags, int count)
+ static unsigned int hci_uart_tty_receive(struct tty_struct *tty,
+ 		const u8 *data, char *flags, int count)
  {
- 	int ret;
  	struct hci_uart *hu = (void *)tty->disc_data;
+ 	int received;
  
  	if (!hu || tty != hu->tty)
- 		return;
+ 		return -ENODEV;
  
  	if (!test_bit(HCI_UART_PROTO_SET, &hu->flags))
- 		return;
+ 		return -EINVAL;
  
  	spin_lock(&hu->rx_lock);
- 	ret = hu->proto->recv(hu, (void *) data, count);
- 	if (ret > 0)
+ 	received = hu->proto->recv(hu, (void *) data, count);
 -	hu->hdev->stat.byte_rx += count;
++	if (received > 0)
 +		hu->hdev->stat.byte_rx += count;
  	spin_unlock(&hu->rx_lock);
  
  	tty_unthrottle(tty);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/