public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Andrey Panin <pazke@donpac.ru>
To: Andrew Morton <akpm@osdl.org>, linux-kernel@vger.kernel.org
Subject: [PATCH 1/5] 2.6.7-mm6, CRC16 renaming in AX25 drivers
Date: Thu, 8 Jul 2004 17:01:21 +0400	[thread overview]
Message-ID: <10892916813150@donpac.ru> (raw)
In-Reply-To: <10892916781086@donpac.ru>


Signed-off-by: Andrey Panin <pazke@donpac.ru>

 drivers/net/hamradio/baycom_epp.c |    6 +++---
 drivers/net/hamradio/hdlcdrv.c    |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff -urpN -X /usr/share/dontdiff linux-2.6.7-mm5.vanilla/drivers/net/hamradio/baycom_epp.c linux-2.6.7-mm5/drivers/net/hamradio/baycom_epp.c
--- linux-2.6.7-mm5.vanilla/drivers/net/hamradio/baycom_epp.c	Thu Jul  1 20:58:11 2004
+++ linux-2.6.7-mm5/drivers/net/hamradio/baycom_epp.c	Thu Jul  1 22:48:50 2004
@@ -58,7 +58,7 @@
 /* prototypes for ax25_encapsulate and ax25_rebuild_header */
 #include <net/ax25.h> 
 #endif /* CONFIG_AX25 || CONFIG_AX25_MODULE */
-#include <linux/crc16.h>
+#include <linux/crc-ccitt.h>
 
 /* --------------------------------------------------------------------- */
 
@@ -281,14 +281,14 @@ static inline void append_crc_ccitt(unsi
 
 static inline int check_crc_ccitt(const unsigned char *buf, int cnt)
 {
-	return (crc16(0xffff, buf, cnt) & 0xffff) == 0xf0b8;
+	return (crc_ccitt(0xffff, buf, cnt) & 0xffff) == 0xf0b8;
 }
 
 /*---------------------------------------------------------------------------*/
 
 static inline int calc_crc_ccitt(const unsigned char *buf, int cnt)
 {
-	return (crc16(0xffff, buf, cnt) ^ 0xffff) & 0xffff;
+	return (crc_ccitt(0xffff, buf, cnt) ^ 0xffff) & 0xffff;
 }
 
 /* ---------------------------------------------------------------------- */
diff -urpN -X /usr/share/dontdiff linux-2.6.7-mm5.vanilla/drivers/net/hamradio/hdlcdrv.c linux-2.6.7-mm5/drivers/net/hamradio/hdlcdrv.c
--- linux-2.6.7-mm5.vanilla/drivers/net/hamradio/hdlcdrv.c	Thu Jul  1 20:58:11 2004
+++ linux-2.6.7-mm5/drivers/net/hamradio/hdlcdrv.c	Thu Jul  1 22:48:27 2004
@@ -66,7 +66,7 @@
 #include <linux/ip.h>
 #include <linux/udp.h>
 #include <linux/tcp.h>
-#include <linux/crc16.h>
+#include <linux/crc-ccitt.h>
 
 /* --------------------------------------------------------------------- */
 
@@ -105,7 +105,7 @@ static char ax25_nocall[AX25_ADDR_LEN] =
 
 static inline void append_crc_ccitt(unsigned char *buffer, int len)
 {
- 	unsigned int crc = crc16(0xffff, buffer, len) ^ 0xffff;
+ 	unsigned int crc = crc_ccitt(0xffff, buffer, len) ^ 0xffff;
 	*buffer++ = crc;
 	*buffer++ = crc >> 8;
 }
@@ -114,7 +114,7 @@ static inline void append_crc_ccitt(unsi
 
 static inline int check_crc_ccitt(const unsigned char *buf, int cnt)
 {
-	return (crc16(0xffff, buf, cnt) & 0xffff) == 0xf0b8;
+	return (crc_ccitt(0xffff, buf, cnt) & 0xffff) == 0xf0b8;
 }
 
 /*---------------------------------------------------------------------------*/


  reply	other threads:[~2004-07-08 13:02 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2004-07-08 13:01 [PATCH 0/5] 2.6.7-mm6, fix CRC16 misnaming Andrey Panin
2004-07-08 13:01 ` Andrey Panin [this message]
2004-07-08 13:01   ` [PATCH 2/5] 2.6.7-mm6, CRC16 renaming in IRDA drivers Andrey Panin
2004-07-08 13:01     ` [PATCH 3/5] 2.6.7-mm6, CRC16 renaming in ISDN drivers Andrey Panin
2004-07-08 13:01       ` [PATCH 4/5] 2.6.7-mm6, CRC16 renaming in PPP driver Andrey Panin
2004-07-08 13:01         ` [PATCH 5/5] 2.6.7-mm6, CRC16 renaming in VIA Velocity ethernet driver Andrey Panin
2004-07-08 13:10 ` [PATCH 0/5] 2.6.7-mm6, fix CRC16 misnaming David Weinehall
2004-07-08 19:11   ` Thomas Sailer
2004-07-09  2:06 ` Andrew Morton

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=10892916813150@donpac.ru \
    --to=pazke@donpac.ru \
    --cc=akpm@osdl.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox