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: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Sjur Brændeland <sjur.brandeland@stericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
525c6465d4
commit
f23aa62545
|
@ -136,20 +136,21 @@ static int cffrml_receive(struct cflayer *layr, struct cfpkt *pkt)
|
||||||
|
|
||||||
static int cffrml_transmit(struct cflayer *layr, struct cfpkt *pkt)
|
static int cffrml_transmit(struct cflayer *layr, struct cfpkt *pkt)
|
||||||
{
|
{
|
||||||
int tmp;
|
|
||||||
u16 chks;
|
u16 chks;
|
||||||
u16 len;
|
u16 len;
|
||||||
|
__le16 data;
|
||||||
|
|
||||||
struct cffrml *this = container_obj(layr);
|
struct cffrml *this = container_obj(layr);
|
||||||
if (this->dofcs) {
|
if (this->dofcs) {
|
||||||
chks = cfpkt_iterate(pkt, cffrml_checksum, 0xffff);
|
chks = cfpkt_iterate(pkt, cffrml_checksum, 0xffff);
|
||||||
tmp = cpu_to_le16(chks);
|
data = cpu_to_le16(chks);
|
||||||
cfpkt_add_trail(pkt, &tmp, 2);
|
cfpkt_add_trail(pkt, &data, 2);
|
||||||
} else {
|
} else {
|
||||||
cfpkt_pad_trail(pkt, 2);
|
cfpkt_pad_trail(pkt, 2);
|
||||||
}
|
}
|
||||||
len = cfpkt_getlen(pkt);
|
len = cfpkt_getlen(pkt);
|
||||||
tmp = cpu_to_le16(len);
|
data = cpu_to_le16(len);
|
||||||
cfpkt_add_head(pkt, &tmp, 2);
|
cfpkt_add_head(pkt, &data, 2);
|
||||||
cfpkt_info(pkt)->hdr_len += 2;
|
cfpkt_info(pkt)->hdr_len += 2;
|
||||||
if (cfpkt_erroneous(pkt)) {
|
if (cfpkt_erroneous(pkt)) {
|
||||||
pr_err("Packet is erroneous!\n");
|
pr_err("Packet is erroneous!\n");
|
||||||
|
|
Loading…
Reference in New Issue