[PATCH] CRC16 renaming in VIA Velocity ethernet driver

Signed-off-by: Andrey Panin <pazke@donpac.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 171c46f1c33c51ab6a6094aef26728fb0bcf2883..ebad23cf2b81789b6463b26916583cf5bbb127cc 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1746,7 +1746,6 @@ config VIA_VELOCITY
        tristate "VIA Velocity support"
        depends on NET_PCI && PCI
        select CRC32
-       select CRC16
        select MII
        help
          If you have a VIA "Velocity" based network card say Y here.

diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index af599f8b535b51bf2a0e6187bbe375171728b75e..eb277539726863d6182c0a95eff8b29f3fab9b9d 100644 (file)
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -78,7 +78,7 @@
 #include <linux/ip.h>
 #include <linux/tcp.h>
 #include <linux/udp.h>
-#include <linux/crc16.h>
+#include <linux/crc-ccitt.h>
 #include <linux/crc32.h>
 
 #include "via-velocity.h"
@@ -3086,7 +3086,7 @@ u16 wol_calc_crc(int size, u8 * pattern, u8 *mask_pattern)
                                continue;
                        }
                        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 */