From a24c8ff91cae3c72fbcc75a527bc250bddef0c5a Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Mon, 21 Nov 2011 16:46:24 -0500
Subject: [PATCH] --- yaml --- r: 276201 b: refs/heads/master c:
 f23aa62545c18728eb2b9434aa258be27e07dd49 h: refs/heads/master i:   276199:
 1b1d628440e9343cc1638a6b347eaf4fefbd5c82 v: v3

---
 [refs]                  |  2 +-
 trunk/net/caif/cffrml.c | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 6a09b16fd94c..3a79a15b401d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 525c6465d449cdec04b3c91733e46027a4d08422
+refs/heads/master: f23aa62545c18728eb2b9434aa258be27e07dd49
diff --git a/trunk/net/caif/cffrml.c b/trunk/net/caif/cffrml.c
index f39921171d0d..d3ca87bf23b7 100644
--- a/trunk/net/caif/cffrml.c
+++ b/trunk/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");