Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f23aa625 authored by Dan Carpenter's avatar Dan Carpenter Committed by David S. Miller
Browse files

caif: fix endian conversion in cffrml_transmit() 



The "tmp" variable here is used to store the result of cpu_to_le16()
so it should be an __le16 instead of an int.  We want the high bits
set and the current code works on little endian systems but not on
big endian systems.

Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Acked-by: default avatarSjur Brændeland <sjur.brandeland@stericsson.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 525c6465

net/caif/cffrml.c

+6 −5
Original line number Diff line number Diff line
@@ -136,20 +136,21 @@ static int cffrml_receive(struct cflayer *layr, struct cfpkt *pkt) 


static int cffrml_transmit(struct cflayer *layr, struct cfpkt *pkt)

{

	int tmp;

	u16 chks;

	u16 len;

	__le16 data;



	struct cffrml *this = container_obj(layr);

	if (this->dofcs) {

		chks = cfpkt_iterate(pkt, cffrml_checksum, 0xffff);

		tmp = cpu_to_le16(chks);

		cfpkt_add_trail(pkt, &tmp, 2);

		data = cpu_to_le16(chks);

		cfpkt_add_trail(pkt, &data, 2);

	} else {

		cfpkt_pad_trail(pkt, 2);

	}

	len = cfpkt_getlen(pkt);

	tmp = cpu_to_le16(len);

	cfpkt_add_head(pkt, &tmp, 2);

	data = cpu_to_le16(len);

	cfpkt_add_head(pkt, &data, 2);

	cfpkt_info(pkt)->hdr_len += 2;

	if (cfpkt_erroneous(pkt)) {

		pr_err("Packet is erroneous!\n");