diff options
| author | Malcolm Priestley <tvboxspy@gmail.com> | 2014-08-17 19:42:25 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-08-30 20:47:31 (GMT) |
| commit | b39d60c1dea7389e3dcd1580f59b6717fa6b0159 (patch) | |
| tree | d8655e599a59675b36b367186203a8175422aba3 /drivers | |
| parent | 65fe76eaa007f7ce7c5c37651217fc58ca571945 (diff) | |
| download | linux-b39d60c1dea7389e3dcd1580f59b6717fa6b0159.tar.xz | |
staging: vt6655: Use ether_crc in kernel.
ether_crc is already in kernel remove local code and
include linux/crc32.h
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/vt6655/device.h | 1 | ||||
| -rw-r--r-- | drivers/staging/vt6655/device_main.c | 17 |
2 files changed, 1 insertions, 17 deletions
diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h index e4c5292..fadebe9 100644 --- a/drivers/staging/vt6655/device.h +++ b/drivers/staging/vt6655/device.h @@ -49,6 +49,7 @@ #include <linux/sched.h> #include <linux/io.h> #include <linux/if.h> +#include <linux/crc32.h> //#include <linux/config.h> #include <linux/uaccess.h> #include <linux/proc_fs.h> diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index a44233c..95460d4 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -2561,23 +2561,6 @@ static irqreturn_t device_intr(int irq, void *dev_instance) return IRQ_RETVAL(handled); } -static unsigned const ethernet_polynomial = 0x04c11db7U; -static inline u32 ether_crc(int length, unsigned char *data) -{ - int crc = -1; - - while (--length >= 0) { - unsigned char current_octet = *data++; - int bit; - - for (bit = 0; bit < 8; bit++, current_octet >>= 1) { - crc = (crc << 1) ^ - ((crc < 0) ^ (current_octet & 1) ? ethernet_polynomial : 0); - } - } - return crc; -} - //2008-8-4 <add> by chester static int Config_FileGetParameter(unsigned char *string, unsigned char *dest, unsigned char *source) |