Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 338085
b: refs/heads/master
c: 3effcd0
h: refs/heads/master
i:
  338083: 1249e03
v: v3
  • Loading branch information
Johan Meiring authored and Greg Kroah-Hartman committed Nov 21, 2012
1 parent 431dd05 commit 1c33285
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0b7ccbeda03a19cfba24f6d6319e5f48e16364a9
refs/heads/master: 3effcd06fb48ae8859817c5bb46b343f87dad2a1
15 changes: 5 additions & 10 deletions trunk/drivers/staging/cxt1e1/sbecrc.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,9 @@ genCrcTable (u_int32_t *CRCTable)
int ii, jj;
u_int32_t crc;

for (ii = 0; ii < CRC_TABLE_ENTRIES; ii++)
{
for (ii = 0; ii < CRC_TABLE_ENTRIES; ii++) {
crc = ii;
for (jj = 8; jj > 0; jj--)
{
for (jj = 8; jj > 0; jj--) {
if (crc & 1)
crc = (crc >> 1) ^ CRC32_POLYNOMIAL;
else
Expand Down Expand Up @@ -98,15 +96,13 @@ sbeCrc (u_int8_t *buffer, /* data buffer to crc */
* checking this every time sbeCrc() is called, since CRC calculations
* are already time consuming
*/
if (!crcTableInit)
{
if (!crcTableInit) {
#ifdef STATIC_CRC_TABLE
tbl = &CRCTable;
genCrcTable (tbl);
#else
tbl = (u_int32_t *) OS_kmalloc (CRC_TABLE_ENTRIES * sizeof (u_int32_t));
if (tbl == 0)
{
if (tbl == 0) {
*result = 0; /* dummy up return value due to malloc
* failure */
return;
Expand All @@ -117,8 +113,7 @@ sbeCrc (u_int8_t *buffer, /* data buffer to crc */
/* inverting bits makes ZMODEM & PKZIP compatible */
crc = initialCrc ^ 0xFFFFFFFFL;

while (count-- != 0)
{
while (count-- != 0) {
temp1 = (crc >> 8) & 0x00FFFFFFL;
temp2 = tbl[((int) crc ^ *buffer++) & 0xff];
crc = temp1 ^ temp2;
Expand Down

0 comments on commit 1c33285

Please sign in to comment.