lkml.org 
[lkml]   [2004]   [Jul]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 1/5] 2.6.7-mm6, CRC16 renaming in AX25 drivers
    Date
    From

    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;
    }

    /*---------------------------------------------------------------------------*/
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2005-03-22 14:04    [W:4.287 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site