diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-10 05:27:25 +0000 |
| commit | c9c06167e7933d93a6e396174c68abf242294abb (patch) | |
| tree | d9a8bb30663e9a3405a1ef37ffb62bc14b9f019f /drivers/net/hamradio | |
| parent | f79e8cc3c34e4192a3e5ef4cc9c6542fdef703c0 (diff) | |
Merge with Linux 2.4.0-test12.
Diffstat (limited to 'drivers/net/hamradio')
| -rw-r--r-- | drivers/net/hamradio/6pack.h | 3 | ||||
| -rw-r--r-- | drivers/net/hamradio/baycom_epp.c | 3 | ||||
| -rw-r--r-- | drivers/net/hamradio/hdlcdrv.c | 21 | ||||
| -rw-r--r-- | drivers/net/hamradio/mkiss.h | 3 |
4 files changed, 16 insertions, 14 deletions
diff --git a/drivers/net/hamradio/6pack.h b/drivers/net/hamradio/6pack.h index b929c83a6..08cee0485 100644 --- a/drivers/net/hamradio/6pack.h +++ b/drivers/net/hamradio/6pack.h @@ -101,7 +101,8 @@ struct sixpack { int mtu; /* Our mtu (to spot changes!) */ int buffsize; /* Max buffers sizes */ - unsigned char flags; /* Flag values/ mode etc */ + unsigned long flags; /* Flag values/ mode etc */ + /* long req'd for set_bit --RR */ unsigned char mode; /* 6pack mode */ /* 6pack stuff */ diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c index 263ae384e..0e41265fe 100644 --- a/drivers/net/hamradio/baycom_epp.c +++ b/drivers/net/hamradio/baycom_epp.c @@ -1023,7 +1023,8 @@ static int epp_open(struct net_device *dev) struct baycom_state *bc; struct parport *pp; const struct tq_struct run_bh = { - 0, 0, (void *)(void *)epp_bh, dev + routine: (void *)(void *)epp_bh, + data: dev }; unsigned int i, j; unsigned char tmp[128]; diff --git a/drivers/net/hamradio/hdlcdrv.c b/drivers/net/hamradio/hdlcdrv.c index 9ccc0d1b4..3ec7b1c1d 100644 --- a/drivers/net/hamradio/hdlcdrv.c +++ b/drivers/net/hamradio/hdlcdrv.c @@ -287,7 +287,7 @@ void hdlcdrv_receiver(struct net_device *dev, struct hdlcdrv_state *s) /* ---------------------------------------------------------------------- */ -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 @@ EXPORT_SYMBOL(hdlcdrv_unregister_hdlcdrv); /* --------------------------------------------------------------------- */ -#ifdef MODULE - -MODULE_AUTHOR("Thomas M. Sailer, sailer@ife.ee.ethz.ch, hb9jnx@hb9w.che.eu"); -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 @@ int __init init_module(void) /* --------------------------------------------------------------------- */ -void cleanup_module(void) +static void __exit hdlcdrv_cleanup_driver(void) { printk(KERN_INFO "hdlcdrv: cleanup\n"); } -#endif /* MODULE */ +/* --------------------------------------------------------------------- */ + +MODULE_AUTHOR("Thomas M. Sailer, sailer@ife.ee.ethz.ch, hb9jnx@hb9w.che.eu"); +MODULE_DESCRIPTION("Packet Radio network interface HDLC encoder/decoder"); +module_init(hdlcdrv_init_driver); +module_exit(hdlcdrv_cleanup_driver); + /* --------------------------------------------------------------------- */ diff --git a/drivers/net/hamradio/mkiss.h b/drivers/net/hamradio/mkiss.h index c24c27819..4a3d700cb 100644 --- a/drivers/net/hamradio/mkiss.h +++ b/drivers/net/hamradio/mkiss.h @@ -42,7 +42,8 @@ struct ax_disp { int buffsize; /* Max buffers sizes */ - unsigned char flags; /* Flag values/ mode etc */ + unsigned long flags; /* Flag values/ mode etc */ + /* long req'd: used by set_bit --RR */ #define AXF_INUSE 0 /* Channel in use */ #define AXF_ESCAPE 1 /* ESC received */ #define AXF_ERROR 2 /* Parity, etc. error */ |