Commit 48c7da8e authored by Andrey Panin's avatar Andrey Panin Committed by Linus Torvalds

[PATCH] CRC16 renaming in VIA Velocity ethernet driver

Signed-off-by: default avatarAndrey Panin <pazke@donpac.ru>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2d80ccba
...@@ -1746,7 +1746,6 @@ config VIA_VELOCITY ...@@ -1746,7 +1746,6 @@ config VIA_VELOCITY
tristate "VIA Velocity support" tristate "VIA Velocity support"
depends on NET_PCI && PCI depends on NET_PCI && PCI
select CRC32 select CRC32
select CRC16
select MII select MII
help help
If you have a VIA "Velocity" based network card say Y here. If you have a VIA "Velocity" based network card say Y here.
......
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
#include <linux/ip.h> #include <linux/ip.h>
#include <linux/tcp.h> #include <linux/tcp.h>
#include <linux/udp.h> #include <linux/udp.h>
#include <linux/crc16.h> #include <linux/crc-ccitt.h>
#include <linux/crc32.h> #include <linux/crc32.h>
#include "via-velocity.h" #include "via-velocity.h"
...@@ -3086,7 +3086,7 @@ u16 wol_calc_crc(int size, u8 * pattern, u8 *mask_pattern) ...@@ -3086,7 +3086,7 @@ u16 wol_calc_crc(int size, u8 * pattern, u8 *mask_pattern)
continue; continue;
} }
mask >>= 1; mask >>= 1;
crc = crc16(crc, &(pattern[i * 8 + j]), 1); crc = crc_ccitt(crc, &(pattern[i * 8 + j]), 1);
} }
} }
/* Finally, invert the result once to get the correct data */ /* Finally, invert the result once to get the correct data */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment