hdlcdrv.c-2.4.0-test12-pre7-patch-v1

From: Hans Grobler (jozwajyf@access.net)
Date: Sat Dec 09 2000 - 08:21:58 EET

  • Next message: Jorge Matias: "Re: protocol 0000 is buggy, dev bcsf0 ???"

    hdlcdrv.c-2.4.0-test12-pre7-patch-v1:
      - do_kiss_params: 'inline' should be at start of line (removes gcc
          warning)
      - init_module,cleanup_module: converted to use new linux2.4
          module definition format.

    diff -u3Nr -X dontdiff linux-2.4.0-test12-pre7.orig/drivers/net/hamradio/hdlcdrv.c linux-2.4.0-test12-pre7/drivers/net/hamradio/hdlcdrv.c
    --- linux-2.4.0-test12-pre7.orig/drivers/net/hamradio/hdlcdrv.c Thu May 4 20:31:21 2000
    +++ linux-2.4.0-test12-pre7/drivers/net/hamradio/hdlcdrv.c Sat Dec 9 08:13:23 2000
    @@ -287,7 +287,7 @@

     /* ---------------------------------------------------------------------- */

    -static void inline do_kiss_params(struct hdlcdrv_state *s,
    +static inline void do_kiss_params(struct hdlcdrv_state *s,
                                       unsigned char *data, unsigned long len)
     {

    @@ -889,14 +889,7 @@

     /* --------------------------------------------------------------------- */

    -#ifdef MODULE
    -
    -MODULE_AUTHOR("Thomas M. Sailer, phbvci@rele.tunk.net, gbjicw@host50-26.crowley.pl");
    -MODULE_DESCRIPTION("Packet Radio network interface HDLC encoder/decoder");
    -
    -/* --------------------------------------------------------------------- */
    -
    -int __init init_module(void)
    +static int __init hdlcdrv_init_driver(void)
     {
             printk(KERN_INFO "hdlcdrv: (C) 1996-2000 Thomas Sailer HB9JNX/AE4WA\n");
             printk(KERN_INFO "hdlcdrv: version 0.8 compiled " __TIME__ " " __DATE__ "\n");
    @@ -905,10 +898,16 @@

     /* --------------------------------------------------------------------- */

    -void cleanup_module(void)
    +static void __exit hdlcdrv_cleanup_driver(void)
     {
             printk(KERN_INFO "hdlcdrv: cleanup\n");
     }

    -#endif /* MODULE */
    +/* --------------------------------------------------------------------- */
    +
    +MODULE_AUTHOR("Thomas M. Sailer, epmw@mailit.tunk.net, terhi.victor@logonet.com");
    +MODULE_DESCRIPTION("Packet Radio network interface HDLC encoder/decoder");
    +module_init(hdlcdrv_init_driver);
    +module_exit(hdlcdrv_cleanup_driver);
    +
     /* --------------------------------------------------------------------- */

    -
    To unsubscribe from this list: send the line "unsubscribe linux-hams" in
    the body of a message to chnxazp@hanover.edu



    This archive was generated by hypermail 2b30 : Sat Dec 09 2000 - 08:25:48 EET