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

6pack: propagage new tty types 



In tty, u8 is now used for data, ssize_t for sizes (with possible
negative error codes). Propagate these types to 6pack.

Signed-off-by: default avatarJiri Slaby (SUSE) <jirislaby@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Andreas Koensgen <ajk@comnets.uni-bremen.de>
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: linux-hams@vger.kernel.org
Cc: netdev@vger.kernel.org
Reviewed-by: default avatarJeremy Kerr <jk@codeconstruct.com.au>
Link: https://lore.kernel.org/r/20240808103549.429349-12-jirislaby@kernel.org


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

drivers/net/hamradio/6pack.c

+16 −16
Original line number Diff line number Diff line
@@ -91,8 +91,8 @@ struct sixpack { 
	unsigned char		*xhead;         /* next byte to XMIT */

	int			xleft;          /* bytes left in XMIT queue  */



	unsigned char		raw_buf[4];

	unsigned char		cooked_buf[400];

	u8			raw_buf[4];

	u8			cooked_buf[400];



	unsigned int		rx_count;

	unsigned int		rx_count_cooked;
@@ -107,8 +107,8 @@ struct sixpack { 
	unsigned char		slottime;

	unsigned char		duplex;

	unsigned char		led_state;

	unsigned char		status;

	unsigned char		status1;

	u8			status;

	u8			status1;

	unsigned char		status2;

	unsigned char		tx_enable;

	unsigned char		tnc_state;
@@ -122,7 +122,7 @@ struct sixpack { 


#define AX25_6PACK_HEADER_LEN 0



static void sixpack_decode(struct sixpack *, const unsigned char[], int);

static void sixpack_decode(struct sixpack *, const u8 *, size_t);

static int encode_sixpack(unsigned char *, unsigned char *, int, unsigned char);



/*
@@ -327,7 +327,7 @@ static void sp_bump(struct sixpack *sp, char cmd) 
{

	struct sk_buff *skb;

	int count;

	unsigned char *ptr;

	u8 *ptr;



	count = sp->rcount + 1;
@@ -425,7 +425,7 @@ static void sixpack_receive_buf(struct tty_struct *tty, const u8 *cp, 
				const u8 *fp, size_t count)

{

	struct sixpack *sp;

	int count1;

	size_t count1;



	if (!count)

		return;
@@ -800,9 +800,9 @@ static int encode_sixpack(unsigned char *tx_buf, unsigned char *tx_buf_raw, 


/* decode 4 sixpack-encoded bytes into 3 data bytes */



static void decode_data(struct sixpack *sp, unsigned char inbyte)

static void decode_data(struct sixpack *sp, u8 inbyte)

{

	unsigned char *buf;

	u8 *buf;



	if (sp->rx_count != 3) {

		sp->raw_buf[sp->rx_count++] = inbyte;
@@ -828,9 +828,9 @@ static void decode_data(struct sixpack *sp, unsigned char inbyte) 


/* identify and execute a 6pack priority command byte */



static void decode_prio_command(struct sixpack *sp, unsigned char cmd)

static void decode_prio_command(struct sixpack *sp, u8 cmd)

{

	int actual;

	ssize_t actual;



	if ((cmd & SIXP_PRIO_DATA_MASK) != 0) {     /* idle ? */
@@ -878,9 +878,9 @@ static void decode_prio_command(struct sixpack *sp, unsigned char cmd) 


/* identify and execute a standard 6pack command byte */



static void decode_std_command(struct sixpack *sp, unsigned char cmd)

static void decode_std_command(struct sixpack *sp, u8 cmd)

{

	unsigned char checksum = 0, rest = 0;

	u8 checksum = 0, rest = 0;

	short i;



	switch (cmd & SIXP_CMD_MASK) {     /* normal command */
@@ -928,10 +928,10 @@ static void decode_std_command(struct sixpack *sp, unsigned char cmd) 
/* decode a 6pack packet */



static void

sixpack_decode(struct sixpack *sp, const unsigned char *pre_rbuff, int count)

sixpack_decode(struct sixpack *sp, const u8 *pre_rbuff, size_t count)

{

	unsigned char inbyte;

	int count1;

	size_t count1;

	u8 inbyte;



	for (count1 = 0; count1 < count; count1++) {

		inbyte = pre_rbuff[count1];