From: gregkh@suse.de (Greg KH)
To: linux-kernel@vger.kernel.org, lm-sensors@lm-sensors.org
Cc: johnpol@2ka.mipt.ru
Subject: [lm-sensors] [PATCH] w1: fix CRC calculation on bigendian platforms.
Date: Tue, 12 Jul 2005 00:04:33 +0000 [thread overview]
Message-ID: <11211193771329@kroah.com> (raw)
In-Reply-To: <1121119377358@kroah.com>
[PATCH] w1: fix CRC calculation on bigendian platforms.
In the 2.6.13-rc1 code the "rn" structure is in the wrong-endianness
when passed to w1_attach_slave_device(). This causes problems like the
family and crc being swapped around.
Signed-off-by: Roger Blofeld <blofeldus@yahoo.com>
Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
commit 0e65f82814e9828d3ff54988de9e7c0b36794daa
tree a4d5dfb9ab550160a453c6266fe67d18ace76857
parent 80efa8c72006a1c04004f8fb07b22073348e4bf2
author Evgeniy Polyakov <johnpol@2ka.mipt.ru> Thu, 30 Jun 2005 22:52:38 +0400
committer Greg Kroah-Hartman <gregkh@suse.de> Mon, 11 Jul 2005 14:10:37 -0700
drivers/w1/w1.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -516,6 +516,7 @@ static void w1_slave_found(unsigned long
struct w1_reg_num *tmp;
int family_found = 0;
struct w1_master *dev;
+ u64 rn_le = cpu_to_le64(rn);
dev = w1_search_master(data);
if (!dev) {
@@ -544,10 +545,8 @@ static void w1_slave_found(unsigned long
slave_count++;
}
- rn = cpu_to_le64(rn);
-
if (slave_count = dev->slave_count &&
- rn && ((le64_to_cpu(rn) >> 56) & 0xff) = w1_calc_crc8((u8 *)&rn, 7)) {
+ rn && ((rn >> 56) & 0xff) = w1_calc_crc8((u8 *)&rn_le, 7)) {
w1_attach_slave_device(dev, tmp);
}
WARNING: multiple messages have this Message-ID (diff)
From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, lm-sensors@lm-sensors.org
Cc: johnpol@2ka.mipt.ru
Subject: [PATCH] w1: fix CRC calculation on bigendian platforms.
Date: Mon, 11 Jul 2005 15:02:57 -0700 [thread overview]
Message-ID: <11211193771329@kroah.com> (raw)
In-Reply-To: <1121119377358@kroah.com>
[PATCH] w1: fix CRC calculation on bigendian platforms.
In the 2.6.13-rc1 code the "rn" structure is in the wrong-endianness
when passed to w1_attach_slave_device(). This causes problems like the
family and crc being swapped around.
Signed-off-by: Roger Blofeld <blofeldus@yahoo.com>
Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
commit 0e65f82814e9828d3ff54988de9e7c0b36794daa
tree a4d5dfb9ab550160a453c6266fe67d18ace76857
parent 80efa8c72006a1c04004f8fb07b22073348e4bf2
author Evgeniy Polyakov <johnpol@2ka.mipt.ru> Thu, 30 Jun 2005 22:52:38 +0400
committer Greg Kroah-Hartman <gregkh@suse.de> Mon, 11 Jul 2005 14:10:37 -0700
drivers/w1/w1.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c
--- a/drivers/w1/w1.c
+++ b/drivers/w1/w1.c
@@ -516,6 +516,7 @@ static void w1_slave_found(unsigned long
struct w1_reg_num *tmp;
int family_found = 0;
struct w1_master *dev;
+ u64 rn_le = cpu_to_le64(rn);
dev = w1_search_master(data);
if (!dev) {
@@ -544,10 +545,8 @@ static void w1_slave_found(unsigned long
slave_count++;
}
- rn = cpu_to_le64(rn);
-
if (slave_count == dev->slave_count &&
- rn && ((le64_to_cpu(rn) >> 56) & 0xff) == w1_calc_crc8((u8 *)&rn, 7)) {
+ rn && ((rn >> 56) & 0xff) == w1_calc_crc8((u8 *)&rn_le, 7)) {
w1_attach_slave_device(dev, tmp);
}
next prev parent reply other threads:[~2005-07-12 0:04 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-07-11 22:01 [GIT PATCH] I2C patches for 2.6.13-rc2 Greg KH
2005-07-12 0:03 ` [lm-sensors] " Greg KH
2005-07-11 22:02 ` [PATCH] I2C: max6875 documentation update Greg KH
2005-07-12 0:04 ` [lm-sensors] " Greg KH
2005-07-11 22:02 ` [PATCH] I2C: max6875 Kconfig update Greg KH
2005-07-12 0:03 ` [lm-sensors] " Greg KH
2005-07-11 22:02 ` [PATCH] I2C: drop bogus eeprom comment Greg KH
2005-07-12 0:04 ` [lm-sensors] " Greg KH
2005-07-11 22:02 ` [PATCH] I2C: Strip trailing whitespace from strings Greg KH
2005-07-12 0:04 ` [lm-sensors] " Greg KH
2005-07-11 22:02 ` [PATCH] I2C: m41t00: fix incorrect kfree Greg KH
2005-07-12 0:04 ` [lm-sensors] " Greg KH
2005-07-11 22:02 ` [PATCH] I2C: Coding style cleanups to via686a Greg KH
2005-07-12 0:04 ` [lm-sensors] " Greg KH
2005-07-11 22:02 ` [PATCH] I2C: minor TPS6501x cleanups Greg KH
2005-07-12 0:04 ` [lm-sensors] " Greg KH
2005-07-11 22:02 ` [PATCH] I2C: New max6875 driver may corrupt EEPROMs Greg KH
2005-07-12 0:04 ` [lm-sensors] " Greg KH
2005-07-11 22:02 ` [PATCH] i2c: make better use of IDR in i2c-core Greg KH
2005-07-12 0:04 ` [lm-sensors] " Greg KH
2005-07-11 22:02 ` Greg KH [this message]
2005-07-12 0:04 ` [lm-sensors] [PATCH] w1: fix CRC calculation on bigendian platforms Greg KH
2005-07-11 22:02 ` [PATCH] I2C: Clarify the usage of i2c-dev.h Greg KH
2005-07-12 0:04 ` [lm-sensors] " Greg KH
2005-07-11 22:02 ` [PATCH] I2C: minor I2C doc cleanups Greg KH
2005-07-12 0:04 ` [lm-sensors] " Greg KH
2005-07-11 22:02 ` [PATCH] I2C: SENSORS_ATXP1 must select I2C_SENSOR Greg KH
2005-07-12 0:04 ` [lm-sensors] " Greg KH
2005-07-11 22:02 ` [PATCH] I2C: Documentation fix Greg KH
2005-07-12 0:04 ` [lm-sensors] " Greg KH
2005-07-11 22:02 ` [PATCH] I2C: Move hwmon drivers (1/3) Greg KH
2005-07-12 0:04 ` [lm-sensors] " Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=11211193771329@kroah.com \
--to=gregkh@suse.de \
--cc=johnpol@2ka.mipt.ru \
--cc=linux-kernel@vger.kernel.org \
--cc=lm-sensors@lm-sensors.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.