1 files changed, 285 insertions, 309 deletions

diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
index 81a1ce88f..3b416ea79 100644
--- a/drivers/net/hamradio/6pack.c
+++ b/drivers/net/hamradio/6pack.c
@@ -13,10 +13,9 @@
  *		Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
  *
  */
- 
+
 #include <linux/config.h>
 #include <linux/module.h>
-
 #include <asm/system.h>
 #include <asm/uaccess.h>
 #include <asm/bitops.h>
@@ -37,24 +36,109 @@
 #include <linux/init.h>
 #include <linux/ip.h>
 #include <linux/tcp.h>
-/* 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <unistd.h> 
-*/
-
-#include "6pack.h"
-
-typedef unsigned char byte;
 
+#define SIXPACK_VERSION    "Revision: 0.3.0"
+
+/* sixpack priority commands */
+#define SIXP_SEOF	0x40	/* start and end of a 6pack frame */
+#define SIXP_TX_URUN	0x48	/* transmit overrun */
+#define SIXP_RX_ORUN	0x50	/* receive overrun */
+#define SIXP_RX_BUF_OVL	0x58	/* receive buffer overflow */
+
+#define SIXP_CHKSUM	0xFF	/* valid checksum of a 6pack frame */
+
+/* masks to get certain bits out of the status bytes sent by the TNC */
+
+#define SIXP_CMD_MASK		0xC0
+#define SIXP_CHN_MASK		0x07
+#define SIXP_PRIO_CMD_MASK	0x80
+#define SIXP_STD_CMD_MASK	0x40
+#define SIXP_PRIO_DATA_MASK	0x38
+#define SIXP_TX_MASK		0x20
+#define SIXP_RX_MASK		0x10
+#define SIXP_RX_DCD_MASK	0x18
+#define SIXP_LEDS_ON		0x78
+#define SIXP_LEDS_OFF		0x60
+#define SIXP_CON		0x08
+#define SIXP_STA		0x10
+
+#define SIXP_FOUND_TNC		0xe9
+#define SIXP_CON_ON		0x68
+#define SIXP_DCD_MASK		0x08
+#define SIXP_DAMA_OFF		0
+
+/* default level 2 parameters */
+#define SIXP_TXDELAY			25	/* in 10 ms */
+#define SIXP_PERSIST			50	/* in 256ths */
+#define SIXP_SLOTTIME			10	/* in 10 ms */
+#define SIXP_INIT_RESYNC_TIMEOUT	150	/* in 10 ms */
+#define SIXP_RESYNC_TIMEOUT		500	/* in 10 ms */
+
+/* 6pack configuration. */
+#define SIXP_NRUNIT			256	/* MAX number of 6pack channels */
+#define SIXP_MTU			256	/* Default MTU */
+
+enum sixpack_flags {
+	SIXPF_INUSE,	/* Channel in use	*/
+	SIXPF_ERROR,	/* Parity, etc. error	*/
+};
+
+struct sixpack {
+	int			magic;
+
+	/* Various fields. */
+	struct tty_struct	*tty;		/* ptr to TTY structure		*/
+	struct net_device	*dev;		/* easy for intr handling	*/
+
+	/* These are pointers to the malloc()ed frame buffers. */
+	unsigned char		*rbuff;		/* receiver buffer		*/
+	int			rcount;         /* received chars counter       */
+	unsigned char		*xbuff;		/* transmitter buffer		*/
+	unsigned char		*xhead;         /* pointer to next byte to XMIT */
+	int			xleft;          /* bytes left in XMIT queue     */
+
+	unsigned char		raw_buf[4];
+	unsigned char		cooked_buf[400];
+
+	unsigned int		rx_count;
+	unsigned int		rx_count_cooked;
+
+	/* 6pack interface statistics. */
+	struct net_device_stats stats;
+
+	int			mtu;		/* Our mtu (to spot changes!)   */
+	int			buffsize;       /* Max buffers sizes            */
+
+	unsigned long		flags;		/* Flag values/ mode etc	*/
+	unsigned char		mode;		/* 6pack mode			*/
+
+	/* 6pack stuff */
+	unsigned char		tx_delay;
+	unsigned char		persistance;
+	unsigned char		slottime;
+	unsigned char		duplex;
+	unsigned char		led_state;
+	unsigned char		status;
+	unsigned char		status1;
+	unsigned char		status2;
+	unsigned char		tx_enable;
+	unsigned char		tnc_ok;
+
+	struct timer_list	tx_t;
+	struct timer_list	resync_t;
+};
+
+/* should later be moved to include/net/ax25.h */
+#define AX25_6PACK_HEADER_LEN 0
+#define SIXPACK_MAGIC 0x5304
+
+static const char banner[] __initdata = KERN_INFO "AX.25: 6pack driver, " SIXPACK_VERSION " (dynamic channels, max=%d)\n";
 
 typedef struct sixpack_ctrl {
 	struct sixpack	ctrl;		/* 6pack things			*/
 	struct net_device	dev;		/* the device			*/
 } sixpack_ctrl_t;
-static sixpack_ctrl_t	**sixpack_ctrls = NULL;
+static sixpack_ctrl_t **sixpack_ctrls;
 int sixpack_maxdev = SIXP_NRUNIT;	/* Can be overridden with insmod! */
 
 static struct tty_ldisc	sp_ldisc;
@@ -62,26 +146,23 @@ static struct tty_ldisc	sp_ldisc;
 static void sp_start_tx_timer(struct sixpack *);
 static void sp_xmit_on_air(unsigned long);
 static void resync_tnc(unsigned long);
-void sixpack_decode(struct sixpack *, unsigned char[], int);
-int encode_sixpack(unsigned char *, unsigned char *, int, unsigned char);
+static void sixpack_decode(struct sixpack *, unsigned char[], int);
+static int encode_sixpack(unsigned char *, unsigned char *, int, unsigned char);
+static int sixpack_init(struct net_device *dev);
 
-void decode_prio_command(byte, struct sixpack *);
-void decode_std_command(byte, struct sixpack *);
-void decode_data(byte, struct sixpack *);
+static void decode_prio_command(unsigned char, struct sixpack *);
+static void decode_std_command(unsigned char, struct sixpack *);
+static void decode_data(unsigned char, struct sixpack *);
 
 static int tnc_init(struct sixpack *);
 
 /* Find a free 6pack channel, and link in this `tty' line. */
-static inline struct sixpack *
-sp_alloc(void)
+static inline struct sixpack *sp_alloc(void)
 {
 	sixpack_ctrl_t *spp = NULL;
 	int i;
 
-	if (sixpack_ctrls == NULL) return NULL;	/* Master array missing ! */
-
-	for (i = 0; i < sixpack_maxdev; i++) 
-	{
+	for (i = 0; i < sixpack_maxdev; i++) {
 		spp = sixpack_ctrls[i];
 
 		if (spp == NULL)
@@ -92,14 +173,13 @@ sp_alloc(void)
 	}
 
 	/* Too many devices... */
-	if (i >= sixpack_maxdev) 
+	if (i >= sixpack_maxdev)
 		return NULL;
 
 	/* If no channels are available, allocate one */
 	if (!spp &&
 	    (sixpack_ctrls[i] = (sixpack_ctrl_t *)kmalloc(sizeof(sixpack_ctrl_t),
-						    GFP_KERNEL)) != NULL) 
-	{
+						    GFP_KERNEL)) != NULL) {
 		spp = sixpack_ctrls[i];
 		memset(spp, 0, sizeof(sixpack_ctrl_t));
 
@@ -108,26 +188,24 @@ sp_alloc(void)
 		spp->ctrl.tty         = NULL;
 		sprintf(spp->dev.name, "sp%d", i);
 		spp->dev.base_addr    = i;
-		spp->dev.priv         = (void*)&(spp->ctrl);
+		spp->dev.priv         = (void *) &spp->ctrl;
 		spp->dev.next         = NULL;
 		spp->dev.init         = sixpack_init;
 	}
 
-	if (spp != NULL) 
-	{
+	if (spp != NULL) {
 		/* register device so that it can be ifconfig'ed       */
 		/* sixpack_init() will be called as a side-effect         */
 		/* SIDE-EFFECT WARNING: sixpack_init() CLEARS spp->ctrl ! */
 
-		if (register_netdev(&(spp->dev)) == 0) 
-		{
+		if (register_netdev(&spp->dev) == 0) {
 			set_bit(SIXPF_INUSE, &spp->ctrl.flags);
-			spp->ctrl.dev = &(spp->dev);
-			spp->dev.priv = (void*)&(spp->ctrl);
-
-			return (&(spp->ctrl));
+			spp->ctrl.dev = &spp->dev;
+			spp->dev.priv = (void *) &spp->ctrl;
+			SET_MODULE_OWNER(&spp->dev);
+			return &spp->ctrl;
 		} else {
-		  	clear_bit(SIXPF_INUSE,&(spp->ctrl.flags));
+			clear_bit(SIXPF_INUSE, &spp->ctrl.flags);
 			printk(KERN_WARNING "sp_alloc() - register_netdev() failure.\n");
 		}
 	}
@@ -137,22 +215,18 @@ sp_alloc(void)
 
 
 /* Free a 6pack channel. */
-static inline void
-sp_free(struct sixpack *sp)
+static inline void sp_free(struct sixpack *sp)
 {
 	/* Free all 6pack frame buffers. */
 	if (sp->rbuff)
 		kfree(sp->rbuff);
 	sp->rbuff = NULL;
-	if (sp->xbuff) {
+	if (sp->xbuff)
 		kfree(sp->xbuff);
-	}
 	sp->xbuff = NULL;
 
-	if (!test_and_clear_bit(SIXPF_INUSE, &sp->flags)) 
-	{
+	if (!test_and_clear_bit(SIXPF_INUSE, &sp->flags))
 		printk(KERN_WARNING "%s: sp_free for already free unit.\n", sp->dev->name);
-	}
 }
 
 
@@ -161,8 +235,7 @@ sp_free(struct sixpack *sp)
 /* This is the routine that sends the received data to the kernel AX.25.
    'cmd' is the KISS command. For AX.25 data, it is zero. */
 
-static void
-sp_bump(struct sixpack *sp, char cmd)
+static void sp_bump(struct sixpack *sp, char cmd)
 {
 	struct sk_buff *skb;
 	int count;
@@ -170,13 +243,11 @@ sp_bump(struct sixpack *sp, char cmd)
 
 	count = sp->rcount+1;
 
-	sp->rx_bytes+=count;
+	sp->stats.rx_bytes += count;
 
-	skb = dev_alloc_skb(count);
-	if (skb == NULL)
-	{
+	if ((skb = dev_alloc_skb(count)) == NULL) {
 		printk(KERN_DEBUG "%s: memory squeeze, dropping packet.\n", sp->dev->name);
-		sp->rx_dropped++;
+		sp->stats.rx_dropped++;
 		return;
 	}
 
@@ -185,61 +256,54 @@ sp_bump(struct sixpack *sp, char cmd)
 	*ptr++ = cmd;	/* KISS command */
 
 	memcpy(ptr, (sp->cooked_buf)+1, count);
-	skb->mac.raw=skb->data;
-	skb->protocol=htons(ETH_P_AX25);
+	skb->mac.raw = skb->data;
+	skb->protocol = htons(ETH_P_AX25);
 	netif_rx(skb);
-	sp->rx_packets++;
+	sp->stats.rx_packets++;
 }
 
 
 /* ----------------------------------------------------------------------- */
 
 /* Encapsulate one AX.25 frame and stuff into a TTY queue. */
-static void
-sp_encaps(struct sixpack *sp, unsigned char *icp, int len)
+static void sp_encaps(struct sixpack *sp, unsigned char *icp, int len)
 {
 	unsigned char *p;
 	int actual, count;
 
-	if (len > sp->mtu) 	/* sp->mtu = AX25_MTU = max. PACLEN = 256 */ 
-	{
-		len = sp->mtu;
+	if (len > sp->mtu) {	/* sp->mtu = AX25_MTU = max. PACLEN = 256 */
 		printk(KERN_DEBUG "%s: truncating oversized transmit packet!\n", sp->dev->name);
-		sp->tx_dropped++;
+		sp->stats.tx_dropped++;
 		netif_start_queue(sp->dev);
 		return;
 	}
 
 	p = icp;
 
-	if (p[0] > 5)
-	{
+	if (p[0] > 5) {
 		printk(KERN_DEBUG "%s: invalid KISS command -- dropped\n", sp->dev->name);
 		netif_start_queue(sp->dev);
 		return;
 	}
 
-	if ((p[0] != 0) && (len > 2))
-	{
+	if ((p[0] != 0) && (len > 2)) {
 		printk(KERN_DEBUG "%s: KISS control packet too long -- dropped\n", sp->dev->name);
 		netif_start_queue(sp->dev);
 		return;
 	}
 
-	if ((p[0] == 0) && (len < 15))
-	{
+	if ((p[0] == 0) && (len < 15)) {
 		printk(KERN_DEBUG "%s: bad AX.25 packet to transmit -- dropped\n", sp->dev->name);
 		netif_start_queue(sp->dev);
-		sp->tx_dropped++;
+		sp->stats.tx_dropped++;
 		return;
 	}
 
 	count = encode_sixpack(p, (unsigned char *) sp->xbuff, len, sp->tx_delay);
 	sp->tty->flags |= (1 << TTY_DO_WRITE_WAKEUP);
 
-	switch(p[0])
-	{
-		case 1:	sp->tx_delay = p[1]; 		return;
+	switch (p[0]) {
+		case 1:	sp->tx_delay = p[1];		return;
 		case 2:	sp->persistance = p[1];		return;
 		case 3: sp->slottime = p[1];		return;
 		case 4: /* ignored */			return;
@@ -251,17 +315,16 @@ sp_encaps(struct sixpack *sp, unsigned char *icp, int len)
 		   about the state of the DCD or of any timers, as the determination
 		   of the correct time to send is the job of the AX.25 layer. We send
 		   immediately after data has arrived. */
-		if (sp->duplex == 1){
+		if (sp->duplex == 1) {
 			sp->led_state = 0x70;
-			sp->tty->driver.write(sp->tty, 0, &(sp->led_state), 1);
+			sp->tty->driver.write(sp->tty, 0, &sp->led_state, 1);
 			sp->tx_enable = 1;
 			actual = sp->tty->driver.write(sp->tty, 0, sp->xbuff, count);
 			sp->xleft = count - actual;
 			sp->xhead = sp->xbuff + actual;
 			sp->led_state = 0x60;
-			sp->tty->driver.write(sp->tty, 0, &(sp->led_state), 1);
-		}
-		else {
+			sp->tty->driver.write(sp->tty, 0, &sp->led_state, 1);
+		} else {
 			sp->xleft = count;
 			sp->xhead = sp->xbuff;
 			sp->status2 = count;
@@ -282,14 +345,13 @@ static void sixpack_write_wakeup(struct tty_struct *tty)
 
 	/* First make sure we're connected. */
 	if (!sp || sp->magic != SIXPACK_MAGIC ||
-	    !netif_running(sp->dev)) {
+	    !netif_running(sp->dev))
 		return;
-	}
 
 	if (sp->xleft <= 0)  {
 		/* Now serial buffer is almost free & we can start
 		 * transmission of another packet */
-		sp->tx_packets++;
+		sp->stats.tx_packets++;
 		tty->flags &= ~(1 << TTY_DO_WRITE_WAKEUP);
 		sp->tx_enable = 0;
 		netif_wake_queue(sp->dev);
@@ -307,51 +369,45 @@ static void sixpack_write_wakeup(struct tty_struct *tty)
 
 /* Encapsulate an IP datagram and kick it into a TTY queue. */
 
-static int
-sp_xmit(struct sk_buff *skb, struct net_device *dev)
+static int sp_xmit(struct sk_buff *skb, struct net_device *dev)
 {
-	struct sixpack *sp = (struct sixpack*)(dev->priv);
+	struct sixpack *sp = (struct sixpack *) dev->priv;
 
 	/* We were not busy, so we are now... :-) */
-	if (skb != NULL) {
-		netif_stop_queue(dev);
-		sp->tx_bytes+=skb->len; /*---2.1.x---*/
-		sp_encaps(sp, skb->data, skb->len);
-		dev_kfree_skb(skb);
-	}
+	netif_stop_queue(dev);
+	sp->stats.tx_bytes += skb->len;
+	sp_encaps(sp, skb->data, skb->len);
+	dev_kfree_skb(skb);
 	return 0;
 }
-/* #endif */
 
 
 /* perform the persistence/slottime algorithm for CSMA access. If the persistence
    check was successful, write the data to the serial driver. Note that in case
    of DAMA operation, the data is not sent here. */
 
-static 
-void sp_xmit_on_air(unsigned long channel)
+static void sp_xmit_on_air(unsigned long channel)
 {
 	struct sixpack *sp = (struct sixpack *) channel;
 	int actual;
 	static unsigned char random;
-	
+
 	random = random * 17 + 41;
 
 	if (((sp->status1 & SIXP_DCD_MASK) == 0) && (random < sp->persistance)) {
 		sp->led_state = 0x70;
-		sp->tty->driver.write(sp->tty, 0, &(sp->led_state),1);
+		sp->tty->driver.write(sp->tty, 0, &sp->led_state, 1);
 		sp->tx_enable = 1;
 		actual = sp->tty->driver.write(sp->tty, 0, sp->xbuff, sp->status2);
 		sp->xleft -= actual;
 		sp->xhead += actual;
 		sp->led_state = 0x60;
-		sp->tty->driver.write(sp->tty, 0, &(sp->led_state),1);
+		sp->tty->driver.write(sp->tty, 0, &sp->led_state, 1);
 		sp->status2 = 0;
 	} else
 		sp_start_tx_timer(sp);
-} /* sp_xmit */
+}
 
-/* #if defined(CONFIG_6PACK) || defined(CONFIG_6PACK_MODULE) */
 
 /* Return the frame type ID */
 static int sp_header(struct sk_buff *skb, struct net_device *dev, unsigned short type,
@@ -374,16 +430,14 @@ static int sp_rebuild_header(struct sk_buff *skb)
 #endif
 }
 
-/* #endif */ /* CONFIG_{AX25,AX25_MODULE} */
 
 /* Open the low-level part of the 6pack channel. */
-static int
-sp_open(struct net_device *dev)
+static int sp_open(struct net_device *dev)
 {
-	struct sixpack *sp = (struct sixpack*)(dev->priv);
+	struct sixpack *sp = (struct sixpack *) dev->priv;
 	unsigned long len;
 
-	if (sp->tty == NULL) 
+	if (sp->tty == NULL)
 		return -ENODEV;
 
 	/*
@@ -391,21 +445,17 @@ sp_open(struct net_device *dev)
 	 *
 	 * rbuff	Receive buffer.
 	 * xbuff	Transmit buffer.
-	 * cbuff        Temporary compression buffer.
 	 */
-	 
+
 	/* !!! length of the buffers. MTU is IP MTU, not PACLEN!
 	 */
 
 	len = dev->mtu * 2;
 
-	sp->rbuff = (unsigned char *) kmalloc(len + 4, GFP_KERNEL);
-	if (sp->rbuff == NULL)   
+	if ((sp->rbuff = kmalloc(len + 4, GFP_KERNEL)) == NULL)
 		return -ENOMEM;
 
-	sp->xbuff = (unsigned char *) kmalloc(len + 4, GFP_KERNEL);
-	if (sp->xbuff == NULL)   
-	{
+	if ((sp->xbuff = kmalloc(len + 4, GFP_KERNEL)) == NULL) {
 		kfree(sp->rbuff);
 		return -ENOMEM;
 	}
@@ -429,7 +479,7 @@ sp_open(struct net_device *dev)
 	sp->status2     = 0;
 	sp->tnc_ok      = 0;
 	sp->tx_enable   = 0;
-	
+
 	netif_start_queue(dev);
 
 	init_timer(&sp->tx_t);
@@ -439,22 +489,20 @@ sp_open(struct net_device *dev)
 
 
 /* Close the low-level part of the 6pack channel. */
-static int
-sp_close(struct net_device *dev)
+static int sp_close(struct net_device *dev)
 {
-	struct sixpack *sp = (struct sixpack*)(dev->priv);
+	struct sixpack *sp = (struct sixpack *) dev->priv;
 
-	if (sp->tty == NULL) {
+	if (sp->tty == NULL)
 		return -EBUSY;
-	}
+
 	sp->tty->flags &= ~(1 << TTY_DO_WRITE_WAKEUP);
-	
+
 	netif_stop_queue(dev);
 	return 0;
 }
 
-static int
-sixpack_receive_room(struct tty_struct *tty)
+static int sixpack_receive_room(struct tty_struct *tty)
 {
 	return 65536;  /* We can handle an infinite amount of data. :-) */
 }
@@ -467,8 +515,7 @@ sixpack_receive_room(struct tty_struct *tty)
  * a block of 6pack data has been received, which can now be decapsulated
  * and sent on to some IP layer for further processing.
  */
-static void
-sixpack_receive_buf(struct tty_struct *tty, const unsigned char *cp, char *fp, int count)
+static void sixpack_receive_buf(struct tty_struct *tty, const unsigned char *cp, char *fp, int count)
 {
 	unsigned char buf[512];
 	unsigned long flags;
@@ -484,18 +531,15 @@ sixpack_receive_buf(struct tty_struct *tty, const unsigned char *cp, char *fp, i
 	cli();
 	memcpy(buf, cp, count<sizeof(buf)? count:sizeof(buf));
 	restore_flags(flags);
-	
+
 	/* Read the characters out of the buffer */
 
 	count1 = count;
-	while(count)
-	{
+	while (count) {
 		count--;
-		if (fp && *fp++)
-		{
-			if (!test_and_set_bit(SIXPF_ERROR, &sp->flags))  {
-				sp->rx_errors++;
-			}			
+		if (fp && *fp++) {
+			if (!test_and_set_bit(SIXPF_ERROR, &sp->flags))
+				sp->stats.rx_errors++;
 			continue;
 		}
 	}
@@ -509,15 +553,14 @@ sixpack_receive_buf(struct tty_struct *tty, const unsigned char *cp, char *fp, i
  * sure the tty line exists, we only have to link it to
  * a free 6pcack channel...
  */
-static int
-sixpack_open(struct tty_struct *tty)
+static int sixpack_open(struct tty_struct *tty)
 {
 	struct sixpack *sp = (struct sixpack *) tty->disc_data;
 	int err;
 
 	/* First make sure we're not already connected. */
 
-	if (sp && sp->magic == SIXPACK_MAGIC) 
+	if (sp && sp->magic == SIXPACK_MAGIC)
 		return -EEXIST;
 
 	/* OK.  Find a free 6pack channel to use. */
@@ -525,21 +568,18 @@ sixpack_open(struct tty_struct *tty)
 		return -ENFILE;
 	sp->tty = tty;
 	tty->disc_data = sp;
-	if (tty->driver.flush_buffer) 
+	if (tty->driver.flush_buffer)
 		tty->driver.flush_buffer(tty);
 
 	if (tty->ldisc.flush_buffer)
 		tty->ldisc.flush_buffer(tty);
 
-
 	/* Restore default settings */
 	sp->dev->type = ARPHRD_AX25;
 
 	/* Perform the low-level 6pack initialization. */
-	if ((err = sp_open(sp->dev)))  
+	if ((err = sp_open(sp->dev)))
 		return err;
-	
-	MOD_INC_USE_COUNT;
 
 	/* Done.  We have linked the TTY line to a channel. */
 
@@ -555,8 +595,7 @@ sixpack_open(struct tty_struct *tty)
  * TTY line discipline to what it was before it got hooked to 6pack
  * (which usually is TTY again).
  */
-static void
-sixpack_close(struct tty_struct *tty)
+static void sixpack_close(struct tty_struct *tty)
 {
 	struct sixpack *sp = (struct sixpack *) tty->disc_data;
 
@@ -565,106 +604,62 @@ sixpack_close(struct tty_struct *tty)
 		return;
 
 	rtnl_lock();
-	if (sp->dev->flags & IFF_UP)
-		(void) dev_close(sp->dev);
+	dev_close(sp->dev);
+
+	del_timer(&sp->tx_t);
+	del_timer(&sp->resync_t);
 
-	del_timer(&(sp->tx_t));
-	del_timer(&(sp->resync_t));
-	
 	tty->disc_data = 0;
 	sp->tty = NULL;
-	/* VSV = very important to remove timers */
 
 	sp_free(sp);
-	unregister_netdev(sp->dev);
+	unregister_netdevice(sp->dev);
 	rtnl_unlock();
-	MOD_DEC_USE_COUNT;
 }
 
 
-static struct net_device_stats *
-sp_get_stats(struct net_device *dev)
+static struct net_device_stats *sp_get_stats(struct net_device *dev)
 {
-	static struct net_device_stats stats;
-	struct sixpack *sp = (struct sixpack*)(dev->priv);
-
-	memset(&stats, 0, sizeof(struct net_device_stats));
-
-	stats.rx_packets     = sp->rx_packets;
-	stats.tx_packets     = sp->tx_packets;
-	stats.rx_bytes       = sp->rx_bytes;
-	stats.tx_bytes       = sp->tx_bytes;
-	stats.rx_dropped     = sp->rx_dropped;
-	stats.tx_dropped     = sp->tx_dropped;
-	stats.tx_errors      = sp->tx_errors;
-	stats.rx_errors      = sp->rx_errors;
-	stats.rx_over_errors = sp->rx_over_errors;
-	return (&stats);
+	struct sixpack *sp = (struct sixpack *) dev->priv;
+	return &sp->stats;
 }
 
 
-int
-sp_set_mac_address(struct net_device *dev, void *addr)
+static int sp_set_mac_address(struct net_device *dev, void *addr)
 {
-	int err;
-
-	err = verify_area(VERIFY_READ, addr, AX25_ADDR_LEN);
-	if (err)  {
-		return err;
-	}
-
-	copy_from_user(dev->dev_addr, addr, AX25_ADDR_LEN);	/* addr is an AX.25 shifted ASCII mac address */
-
-	return 0;
+	return copy_from_user(dev->dev_addr, addr, AX25_ADDR_LEN) ? -EFAULT : 0;
 }
 
-static int
-sp_set_dev_mac_address(struct net_device *dev, void *addr)
+static int sp_set_dev_mac_address(struct net_device *dev, void *addr)
 {
-	struct sockaddr *sa=addr;
+	struct sockaddr *sa = addr;
 	memcpy(dev->dev_addr, sa->sa_data, AX25_ADDR_LEN);
 	return 0;
 }
 
 
 /* Perform I/O control on an active 6pack channel. */
-static int
-sixpack_ioctl(struct tty_struct *tty, void *file, int cmd, void *arg)
+static int sixpack_ioctl(struct tty_struct *tty, void *file, int cmd, void *arg)
 {
 	struct sixpack *sp = (struct sixpack *) tty->disc_data;
-	int err;
 	unsigned int tmp;
 
 	/* First make sure we're connected. */
-	if (!sp || sp->magic != SIXPACK_MAGIC) {
+	if (!sp || sp->magic != SIXPACK_MAGIC)
 		return -EINVAL;
-	}
 
 	switch(cmd) {
-	 case SIOCGIFNAME:
-		err = verify_area(VERIFY_WRITE, arg, strlen(sp->dev->name) + 1);
-		if (err)  {
-			return err;
-		}
-		copy_to_user(arg, sp->dev->name, strlen(sp->dev->name) + 1);
-		return 0;
+	case SIOCGIFNAME:
+		return copy_to_user(arg, sp->dev->name, strlen(sp->dev->name) + 1) ? -EFAULT : 0;
 
 	case SIOCGIFENCAP:
-		err = verify_area(VERIFY_WRITE, arg, sizeof(int));
-		if (err)  {
-			return err;
-		}
-		put_user(0, (int *)arg);
-		return 0;
+		return put_user(0, (int *)arg);
 
 	case SIOCSIFENCAP:
-		err = verify_area(VERIFY_READ, arg, sizeof(int));
-		if (err)  {
-			return err;
-		}
-		get_user(tmp,(int *)arg);
+		if (get_user(tmp, (int *) arg))
+			return -EFAULT;
 
- 		sp->mode = tmp;
+		sp->mode = tmp;
 		sp->dev->addr_len        = AX25_ADDR_LEN;	  /* sizeof an AX.25 addr */
 		sp->dev->hard_header_len = AX25_KISS_HEADER_LEN + AX25_MAX_HEADER_LEN + 3;
 		sp->dev->type            = ARPHRD_AX25;
@@ -686,26 +681,25 @@ sixpack_ioctl(struct tty_struct *tty, void *file, int cmd, void *arg)
 
 static int sp_open_dev(struct net_device *dev)
 {
-	struct sixpack *sp = (struct sixpack*)(dev->priv);
-	if(sp->tty==NULL)
+	struct sixpack *sp = (struct sixpack *) dev->priv;
+	if (sp->tty == NULL)
 		return -ENODEV;
 	return 0;
 }
 
 /* Initialize 6pack control device -- register 6pack line discipline */
 
-static int __init sixpack_init_ctrl_dev(void)
+static int __init sixpack_init_driver(void)
 {
 	int status;
 
-	if (sixpack_maxdev < 4) sixpack_maxdev = 4; /* Sanity */
+	if (sixpack_maxdev < 4)
+		sixpack_maxdev = 4; /* Sanity */
 
-	printk(KERN_INFO "AX.25: 6pack driver, %s (dynamic channels, max=%d)\n",
-	       SIXPACK_VERSION, sixpack_maxdev);
+	printk(banner, sixpack_maxdev);
 
 	sixpack_ctrls = (sixpack_ctrl_t **) kmalloc(sizeof(void*)*sixpack_maxdev, GFP_KERNEL);
-	if (sixpack_ctrls == NULL) 
-	{
+	if (sixpack_ctrls == NULL) {
 		printk(KERN_WARNING "6pack: Can't allocate sixpack_ctrls[] array!  Uaargh! (-> No 6pack available)\n");
 		return -ENOMEM;
 	}
@@ -713,9 +707,7 @@ static int __init sixpack_init_ctrl_dev(void)
 	/* Clear the pointer array, we allocate devices when we need them */
 	memset(sixpack_ctrls, 0, sizeof(void*)*sixpack_maxdev); /* Pointers */
 
-
 	/* Fill in our line protocol discipline, and register it */
-	memset(&sp_ldisc, 0, sizeof(sp_ldisc));
 	sp_ldisc.magic  = TTY_LDISC_MAGIC;
 	sp_ldisc.name   = "6pack";
 	sp_ldisc.flags  = 0;
@@ -731,6 +723,7 @@ static int __init sixpack_init_ctrl_dev(void)
 	sp_ldisc.write_wakeup = sixpack_write_wakeup;
 	if ((status = tty_register_ldisc(N_6PACK, &sp_ldisc)) != 0)  {
 		printk(KERN_WARNING "6pack: can't register line discipline (err = %d)\n", status);
+		kfree(sixpack_ctrls);
 	}
 
 	return status;
@@ -740,38 +733,28 @@ static void __exit sixpack_cleanup_driver(void)
 {
 	int i;
 
-	if (sixpack_ctrls != NULL) 
-	{
-		for (i = 0; i < sixpack_maxdev; i++)  
-		{
-			if (sixpack_ctrls[i])
-			{
-				/*
-				 * VSV = if dev->start==0, then device
-				 * unregistered while close proc.
-				 */ 
-				if (netif_running(&sixpack_ctrls[i]->dev))
-					unregister_netdev(&sixpack_ctrls[i]->dev);
-
-				kfree(sixpack_ctrls[i]);
-				sixpack_ctrls[i] = NULL;
-			}
+	for (i = 0; i < sixpack_maxdev; i++) {
+		if (sixpack_ctrls[i]) {
+			/*
+			* VSV = if dev->start==0, then device
+			* unregistered while close proc.
+			*/
+			if (netif_running(&sixpack_ctrls[i]->dev))
+				 unregister_netdev(&sixpack_ctrls[i]->dev);
+
+			kfree(sixpack_ctrls[i]);
 		}
-		kfree(sixpack_ctrls);
-		sixpack_ctrls = NULL;
 	}
-	if ((i = tty_register_ldisc(N_6PACK, NULL)))  
-	{
+	kfree(sixpack_ctrls);
+	if ((i = tty_register_ldisc(N_6PACK, NULL)))
 		printk(KERN_WARNING "6pack: can't unregister line discipline (err = %d)\n", i);
-	}
 }
 
 
 /* Initialize the 6pack driver.  Called by DDI. */
-int
-sixpack_init(struct net_device *dev)
+static int sixpack_init(struct net_device *dev)
 {
-	struct sixpack *sp = (struct sixpack*)(dev->priv);
+	struct sixpack *sp = (struct sixpack *) dev->priv;
 
 	static char ax25_bcast[AX25_ADDR_LEN] =
 		{'Q'<<1,'S'<<1,'T'<<1,' '<<1,' '<<1,' '<<1,'0'<<1};
@@ -779,14 +762,14 @@ sixpack_init(struct net_device *dev)
 		{'L'<<1,'I'<<1,'N'<<1,'U'<<1,'X'<<1,' '<<1,'1'<<1};
 
 	if (sp == NULL)		/* Allocation failed ?? */
-	  return -ENODEV;
+		return -ENODEV;
 
 	/* Set up the "6pack Control Block". (And clear statistics) */
-	
+
 	memset(sp, 0, sizeof (struct sixpack));
 	sp->magic  = SIXPACK_MAGIC;
 	sp->dev	   = dev;
-	
+
 	/* Finish setting up the DEVICE info. */
 	dev->mtu		= SIXP_MTU;
 	dev->hard_start_xmit	= sp_xmit;
@@ -817,66 +800,62 @@ sixpack_init(struct net_device *dev)
 
 
 /* ----> 6pack timer interrupt handler and friends. <---- */
-static void 
-sp_start_tx_timer(struct sixpack *sp)
+static void sp_start_tx_timer(struct sixpack *sp)
 {
 	int when = sp->slottime;
-	
-	del_timer(&(sp->tx_t));
+
+	del_timer(&sp->tx_t);
 	sp->tx_t.data = (unsigned long) sp;
 	sp->tx_t.function = sp_xmit_on_air;
 	sp->tx_t.expires = jiffies + ((when+1)*HZ)/100;
-	add_timer(&(sp->tx_t));
+	add_timer(&sp->tx_t);
 }
 
 
 /* encode an AX.25 packet into 6pack */
 
-int encode_sixpack(byte *tx_buf, byte *tx_buf_raw, int length, byte tx_delay)
+static int encode_sixpack(unsigned char *tx_buf, unsigned char *tx_buf_raw, int length, unsigned char tx_delay)
 {
 	int count = 0;
-	byte checksum = 0, buf[400];
+	unsigned char checksum = 0, buf[400];
 	int raw_count = 0;
 
 	tx_buf_raw[raw_count++] = SIXP_PRIO_CMD_MASK | SIXP_TX_MASK;
 	tx_buf_raw[raw_count++] = SIXP_SEOF;
 
 	buf[0] = tx_delay;
-	for(count = 1; count < length; count++)
+	for (count = 1; count < length; count++)
 		buf[count] = tx_buf[count];
 
-	for(count = 0; count < length; count++)
+	for (count = 0; count < length; count++)
 		checksum += buf[count];
-	buf[length] = (byte)0xff - checksum;
-	
-	for(count = 0; count <= length; count++) {
-		if((count % 3) == 0) {
+	buf[length] = (unsigned char) 0xff - checksum;
+
+	for (count = 0; count <= length; count++) {
+		if ((count % 3) == 0) {
 			tx_buf_raw[raw_count++] = (buf[count] & 0x3f);
 			tx_buf_raw[raw_count] = ((buf[count] >> 2) & 0x30);
-		}
-		else if((count % 3) == 1) {
+		} else if ((count % 3) == 1) {
 			tx_buf_raw[raw_count++] |= (buf[count] & 0x0f);
-			tx_buf_raw[raw_count] =
-				((buf[count] >> 2) & 0x3c);
+			tx_buf_raw[raw_count] =	((buf[count] >> 2) & 0x3c);
 		} else {
 			tx_buf_raw[raw_count++] |= (buf[count] & 0x03);
-			tx_buf_raw[raw_count++] =
-				(buf[count] >> 2);
-		} /* else */
-	} /* for */
+			tx_buf_raw[raw_count++] = (buf[count] >> 2);
+		}
+	}
 	if ((length % 3) != 2)
 		raw_count++;
 	tx_buf_raw[raw_count++] = SIXP_SEOF;
-	return(raw_count);
+	return raw_count;
 }
 
 
 /* decode a 6pack packet */
 
-void
+static void
 sixpack_decode(struct sixpack *sp, unsigned char pre_rbuff[], int count)
 {
-	byte inbyte;
+	unsigned char inbyte;
 	int count1;
 
 	for (count1 = 0; count1 < count; count1++) {
@@ -884,32 +863,28 @@ sixpack_decode(struct sixpack *sp, unsigned char pre_rbuff[], int count)
 		if (inbyte == SIXP_FOUND_TNC) {
 			printk(KERN_INFO "6pack: TNC found.\n");
 			sp->tnc_ok = 1;
-			del_timer(&(sp->resync_t));
+			del_timer(&sp->resync_t);
 		}
-		if((inbyte & SIXP_PRIO_CMD_MASK) != 0)
+		if ((inbyte & SIXP_PRIO_CMD_MASK) != 0)
 			decode_prio_command(inbyte, sp);
-		else if((inbyte & SIXP_STD_CMD_MASK) != 0)
+		else if ((inbyte & SIXP_STD_CMD_MASK) != 0)
 			decode_std_command(inbyte, sp);
-		else {
-			if ((sp->status & SIXP_RX_DCD_MASK) == SIXP_RX_DCD_MASK)
-				decode_data(inbyte, sp);
-		} /* else */
-	} /* for */
+		else if ((sp->status & SIXP_RX_DCD_MASK) == SIXP_RX_DCD_MASK)
+			decode_data(inbyte, sp);
+	}
 }
 
-static int
-tnc_init(struct sixpack *sp)
+static int tnc_init(struct sixpack *sp)
 {
-	static byte inbyte;
-	
-	inbyte = 0xe8;
+	unsigned char inbyte = 0xe8;
+
 	sp->tty->driver.write(sp->tty, 0, &inbyte, 1);
 
-	del_timer(&(sp->resync_t));
+	del_timer(&sp->resync_t);
 	sp->resync_t.data = (unsigned long) sp;
 	sp->resync_t.function = resync_tnc;
 	sp->resync_t.expires = jiffies + SIXP_RESYNC_TIMEOUT;
-	add_timer(&(sp->resync_t));
+	add_timer(&sp->resync_t);
 
 	return 0;
 }
@@ -917,9 +892,9 @@ tnc_init(struct sixpack *sp)
 
 /* identify and execute a 6pack priority command byte */
 
-void decode_prio_command(byte cmd, struct sixpack *sp)
+static void decode_prio_command(unsigned char cmd, struct sixpack *sp)
 {
-	byte channel;
+	unsigned char channel;
 	int actual;
 
 	channel = cmd & SIXP_CHN_MASK;
@@ -941,11 +916,11 @@ void decode_prio_command(byte cmd, struct sixpack *sp)
 				cmd &= !SIXP_RX_DCD_MASK;
 		}
 		sp->status = cmd & SIXP_PRIO_DATA_MASK;
-	} /* if */
+	}
 	else { /* output watchdog char if idle */
 		if ((sp->status2 != 0) && (sp->duplex == 1)) {
 			sp->led_state = 0x70;
-			sp->tty->driver.write(sp->tty, 0, &(sp->led_state), 1);
+			sp->tty->driver.write(sp->tty, 0, &sp->led_state, 1);
 			sp->tx_enable = 1;
 			actual = sp->tty->driver.write(sp->tty, 0, sp->xbuff, sp->status2);
 			sp->xleft -= actual;
@@ -953,21 +928,21 @@ void decode_prio_command(byte cmd, struct sixpack *sp)
 			sp->led_state = 0x60;
 			sp->status2 = 0;
 
-		} /* if */
-	} /* else */
+		}
+	}
 
 	/* needed to trigger the TNC watchdog */
-	sp->tty->driver.write(sp->tty, 0, &(sp->led_state), 1);
+	sp->tty->driver.write(sp->tty, 0, &sp->led_state, 1);
 
         /* if the state byte has been received, the TNC is present,
            so the resync timer can be reset. */
 
 	if (sp->tnc_ok == 1) {
-		del_timer(&(sp->resync_t));
+		del_timer(&sp->resync_t);
 		sp->resync_t.data = (unsigned long) sp;
 		sp->resync_t.function = resync_tnc;
 		sp->resync_t.expires = jiffies + SIXP_INIT_RESYNC_TIMEOUT;
-		add_timer(&(sp->resync_t));
+		add_timer(&sp->resync_t);
 	}
 
 	sp->status1 = cmd & SIXP_PRIO_DATA_MASK;
@@ -976,8 +951,7 @@ void decode_prio_command(byte cmd, struct sixpack *sp)
 /* try to resync the TNC. Called by the resync timer defined in
   decode_prio_command */
 
-static void
-resync_tnc(unsigned long channel)
+static void resync_tnc(unsigned long channel)
 {
 	static char resync_cmd = 0xe8;
 	struct sixpack *sp = (struct sixpack *) channel;
@@ -985,7 +959,7 @@ resync_tnc(unsigned long channel)
 	printk(KERN_INFO "6pack: resyncing TNC\n");
 
 	/* clear any data that might have been received */
-	
+
 	sp->rx_count = 0;
 	sp->rx_count_cooked = 0;
 
@@ -995,63 +969,63 @@ resync_tnc(unsigned long channel)
 	sp->status1 = 1;
 	sp->status2 = 0;
 	sp->tnc_ok = 0;
-	
+
 	/* resync the TNC */
 
 	sp->led_state = 0x60;
-	sp->tty->driver.write(sp->tty, 0, &(sp->led_state), 1);
+	sp->tty->driver.write(sp->tty, 0, &sp->led_state, 1);
 	sp->tty->driver.write(sp->tty, 0, &resync_cmd, 1);
 
 
 	/* Start resync timer again -- the TNC might be still absent */
 
-	del_timer(&(sp->resync_t));
+	del_timer(&sp->resync_t);
 	sp->resync_t.data = (unsigned long) sp;
 	sp->resync_t.function = resync_tnc;
 	sp->resync_t.expires = jiffies + SIXP_RESYNC_TIMEOUT;
-	add_timer(&(sp->resync_t));
+	add_timer(&sp->resync_t);
 }
 
 
 
 /* identify and execute a standard 6pack command byte */
 
-void decode_std_command(byte cmd, struct sixpack *sp)
+static void decode_std_command(unsigned char cmd, struct sixpack *sp)
 {
-	byte checksum = 0, rest = 0, channel;
+	unsigned char checksum = 0, rest = 0, channel;
 	short i;
 
 	channel = cmd & SIXP_CHN_MASK;
-	switch(cmd & SIXP_CMD_MASK) {     /* normal command */
+	switch (cmd & SIXP_CMD_MASK) {     /* normal command */
 		case SIXP_SEOF:
 			if ((sp->rx_count == 0) && (sp->rx_count_cooked == 0)) {
 				if ((sp->status & SIXP_RX_DCD_MASK) ==
 					SIXP_RX_DCD_MASK) {
 					sp->led_state = 0x68;
-					sp->tty->driver.write(sp->tty, 0, &(sp->led_state), 1);
-				} /* if */
+					sp->tty->driver.write(sp->tty, 0, &sp->led_state, 1);
+				}
 			} else {
 				sp->led_state = 0x60;
 				/* fill trailing bytes with zeroes */
-				sp->tty->driver.write(sp->tty, 0, &(sp->led_state), 1);
+				sp->tty->driver.write(sp->tty, 0, &sp->led_state, 1);
 				rest = sp->rx_count;
 				if (rest != 0)
-					 for(i=rest; i<=3; i++)
+					 for (i = rest; i <= 3; i++)
 						decode_data(0, sp);
 				if (rest == 2)
 					sp->rx_count_cooked -= 2;
 				else if (rest == 3)
 					sp->rx_count_cooked -= 1;
-				for (i=0; i<sp->rx_count_cooked; i++)
-					checksum+=sp->cooked_buf[i];
+				for (i = 0; i < sp->rx_count_cooked; i++)
+					checksum += sp->cooked_buf[i];
 				if (checksum != SIXP_CHKSUM) {
 					printk(KERN_DEBUG "6pack: bad checksum %2.2x\n", checksum);
 				} else {
 					sp->rcount = sp->rx_count_cooked-2;
 					sp_bump(sp, 0);
-				} /* else */
+				}
 				sp->rx_count_cooked = 0;
-			} /* else */
+			}
 			break;
 		case SIXP_TX_URUN: printk(KERN_DEBUG "6pack: TX underrun\n");
 			break;
@@ -1059,14 +1033,13 @@ void decode_std_command(byte cmd, struct sixpack *sp)
 			break;
 		case SIXP_RX_BUF_OVL:
 			printk(KERN_DEBUG "6pack: RX buffer overflow\n");
-	} /* switch */
-} /* function */
+	}
+}
 
 /* decode 4 sixpack-encoded bytes into 3 data bytes */
 
-void decode_data(byte inbyte, struct sixpack *sp)
+static void decode_data(unsigned char inbyte, struct sixpack *sp)
 {
-
 	unsigned char *buf;
 
 	if (sp->rx_count != 3)
@@ -1086,5 +1059,8 @@ void decode_data(byte inbyte, struct sixpack *sp)
 
 MODULE_AUTHOR("Andreas Könsgen <ajk@ccac.rwth-aachen.de>");
 MODULE_DESCRIPTION("6pack driver for AX.25");
-module_init(sixpack_init_ctrl_dev);
+MODULE_PARM(sixpack_maxdev, "i");
+MODULE_PARM_DESC(sixpack_maxdev, "number of 6PACK devices");
+
+module_init(sixpack_init_driver);
 module_exit(sixpack_cleanup_driver);