Commit be9a2845 authored by Jiri Slaby (SUSE)'s avatar Jiri Slaby (SUSE) Committed by Greg Kroah-Hartman
Browse files

mctp: serial: propagage new tty types 



In tty, u8 is now used for data, ssize_t for sizes (with possible
negative error codes). Propagate these types (and use unsigned in
next_chunk_len()) to mctp.

Signed-off-by: default avatarJiri Slaby (SUSE) <jirislaby@kernel.org>
Reviewed-by: default avatarJeremy Kerr <jk@codeconstruct.com.au>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jeremy Kerr <jk@codeconstruct.com.au>
Cc: Matt Johnston <matt@codeconstruct.com.au>
Cc: David S. Miller <davem@davemloft.net>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: netdev@vger.kernel.org
Link: https://lore.kernel.org/r/20240808103549.429349-7-jirislaby@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 866025f0

drivers/net/mctp/mctp-serial.c

+12 −11
Original line number Diff line number Diff line
@@ -64,18 +64,18 @@ struct mctp_serial { 
	u16			txfcs, rxfcs, rxfcs_rcvd;

	unsigned int		txlen, rxlen;

	unsigned int		txpos, rxpos;

	unsigned char		txbuf[BUFSIZE],

	u8			txbuf[BUFSIZE],

				rxbuf[BUFSIZE];

};



static bool needs_escape(unsigned char c)

static bool needs_escape(u8 c)

{

	return c == BYTE_ESC || c == BYTE_FRAME;

}



static int next_chunk_len(struct mctp_serial *dev)

static unsigned int next_chunk_len(struct mctp_serial *dev)

{

	int i;

	unsigned int i;



	/* either we have no bytes to send ... */

	if (dev->txpos == dev->txlen)
@@ -99,7 +99,7 @@ static int next_chunk_len(struct mctp_serial *dev) 
	return i;

}



static int write_chunk(struct mctp_serial *dev, unsigned char *buf, int len)

static ssize_t write_chunk(struct mctp_serial *dev, u8 *buf, size_t len)

{

	return dev->tty->ops->write(dev->tty, buf, len);

}
@@ -108,9 +108,10 @@ static void mctp_serial_tx_work(struct work_struct *work) 
{

	struct mctp_serial *dev = container_of(work, struct mctp_serial,

					       tx_work);

	unsigned char c, buf[3];

	unsigned long flags;

	int len, txlen;

	ssize_t txlen;

	unsigned int len;

	u8 c, buf[3];



	spin_lock_irqsave(&dev->lock, flags);
@@ -293,7 +294,7 @@ static void mctp_serial_rx(struct mctp_serial *dev) 
	dev->netdev->stats.rx_bytes += dev->rxlen;

}



static void mctp_serial_push_header(struct mctp_serial *dev, unsigned char c)

static void mctp_serial_push_header(struct mctp_serial *dev, u8 c)

{

	switch (dev->rxpos) {

	case 0:
@@ -323,7 +324,7 @@ static void mctp_serial_push_header(struct mctp_serial *dev, unsigned char c) 
	}

}



static void mctp_serial_push_trailer(struct mctp_serial *dev, unsigned char c)

static void mctp_serial_push_trailer(struct mctp_serial *dev, u8 c)

{

	switch (dev->rxpos) {

	case 0:
@@ -347,7 +348,7 @@ static void mctp_serial_push_trailer(struct mctp_serial *dev, unsigned char c) 
	}

}



static void mctp_serial_push(struct mctp_serial *dev, unsigned char c)

static void mctp_serial_push(struct mctp_serial *dev, u8 c)

{

	switch (dev->rxstate) {

	case STATE_IDLE:
@@ -394,7 +395,7 @@ static void mctp_serial_tty_receive_buf(struct tty_struct *tty, const u8 *c, 
					const u8 *f, size_t len)

{

	struct mctp_serial *dev = tty->disc_data;

	int i;

	size_t i;



	if (!netif_running(dev->netdev))

		return;