Merge branch 'for-greg' of git://gitorious.org/usb/usb into usb-linus

[firefly-linux-kernel-4.4.55.git] / include / linux / crc32.h

diff --git a/include/linux/crc32.h b/include/linux/crc32.h
index 56c0645789a9b3a3cd85d4ada7df068904aae907..391a259b2cc90784157d57d1f5ca1c14641636e1 100644 (file)
--- a/include/linux/crc32.h
+++ b/include/linux/crc32.h
@@ -6,12 +6,12 @@
 #define _LINUX_CRC32_H
 
 #include <linux/types.h>
+#include <linux/bitrev.h>
 
 extern u32  crc32_le(u32 crc, unsigned char const *p, size_t len);
 extern u32  crc32_be(u32 crc, unsigned char const *p, size_t len);
-extern u32  bitreverse(u32 in);
 
-#define crc32(seed, data, length)  crc32_le(seed, (unsigned char const *)data, length)
+#define crc32(seed, data, length)  crc32_le(seed, (unsigned char const *)(data), length)
 
 /*
  * Helpers for hash table generation of ethernet nics:
@@ -21,7 +21,7 @@ extern u32  bitreverse(u32 in);
  * is in bit nr 0], thus it must be reversed before use. Except for
  * nics that bit swap the result internally...
  */
-#define ether_crc(length, data)    bitreverse(crc32_le(~0, data, length))
+#define ether_crc(length, data)    bitrev32(crc32_le(~0, data, length))
 #define ether_crc_le(length, data) crc32_le(~0, data, length)
 
 #endif /* _LINUX_CRC32_H */