diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-13 19:35:03 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-13 19:35:03 -0800 |
| commit | 2da994e687f7991cc76e3270c423bf6500b9424a (patch) | |
| tree | 437d685035c2a39395f14c233831422ed636c016 /net/caif/cffrml.c | |
| parent | 00e929808a1cb410f45a620c0fc79d8d0a2506b1 (diff) | |
| parent | db33f4de9952af112b0d4f2436ce931ae632aba0 (diff) | |
Merge branch 'orion/devel' into next/devel
Diffstat (limited to 'net/caif/cffrml.c')
| -rw-r--r-- | net/caif/cffrml.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/net/caif/cffrml.c b/net/caif/cffrml.c index f39921171d0d..d3ca87bf23b7 100644 --- a/net/caif/cffrml.c +++ b/net/caif/cffrml.c @@ -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"); |