1 files changed, 379 insertions, 355 deletions

diff --git a/drivers/net/usb/axusbnet.c b/drivers/net/usb/axusbnet.c
index 00393d38a379..71ad734c7f19 100644
--- a/drivers/net/usb/axusbnet.c
+++ b/drivers/net/usb/axusbnet.c
@@ -30,8 +30,10 @@
  * issues can usefully be addressed by this framework.
  */
 
-#define	DEBUG			// error path messages, extra info
-// #define	VERBOSE			// more; success messages
+/* error path messages, extra info */
+#define	DEBUG
+/* more; success messages */
+/* #define	VERBOSE	*/
 
 #include <linux/module.h>
 #include <linux/init.h>
@@ -51,7 +53,7 @@
 
 static void axusbnet_unlink_rx_urbs(struct usbnet *);
 
-extern void
+static void
 ax8817x_write_cmd_async(struct usbnet *dev, u8 cmd, u16 value, u16 index,
 				    u16 size, void *data);
 
@@ -74,25 +76,25 @@ ax8817x_write_cmd_async(struct usbnet *dev, u8 cmd, u16 value, u16 index,
 #define	TX_QLEN(dev) (((dev)->udev->speed == USB_SPEED_HIGH) ? \
 			(RX_MAX_QUEUE_MEMORY/(dev)->hard_mtu) : 4)
 
-// reawaken network queue this soon after stopping; else watchdog barks
-//#define TX_TIMEOUT_JIFFIES	(5*HZ)
-#define TX_TIMEOUT_JIFFIES	(30*HZ)
+/* reawaken network queue this soon after stopping; else watchdog barks */
+/* #define TX_TIMEOUT_JIFFIES	(5 * HZ) */
+#define TX_TIMEOUT_JIFFIES	(30 * HZ)
 
-// throttle rx/tx briefly after some faults, so khubd might disconnect()
-// us (it polls at HZ/4 usually) before we report too many false errors.
-#define THROTTLE_JIFFIES	(HZ/8)
+/* throttle rx/tx briefly after some faults, so khubd might disconnect() */
+/* us (it polls at HZ/4 usually) before we report too many false errors. */
+#define THROTTLE_JIFFIES	(HZ / 8)
 
-// between wakeups
+/* between wakeups */
 #define UNLINK_TIMEOUT_MS	3
 
 /*-------------------------------------------------------------------------*/
 
-static const char driver_name [] = "axusbnet";
+static const char driver_name[] = "axusbnet";
 
 /* use ethtool to change the level for any given device */
 static int msg_level = -1;
-module_param (msg_level, int, 0);
-MODULE_PARM_DESC (msg_level, "Override default message level");
+module_param(msg_level, int, 0);
+MODULE_PARM_DESC(msg_level, "Override default message level");
 
 /*-------------------------------------------------------------------------*/
 
@@ -149,27 +151,27 @@ int axusbnet_get_endpoints(struct usbnet *dev, struct usb_interface *intf)
 
 	if (alt->desc.bAlternateSetting != 0
 			|| !(dev->driver_info->flags & FLAG_NO_SETINT)) {
-		tmp = usb_set_interface (dev->udev, alt->desc.bInterfaceNumber,
+		tmp = usb_set_interface(dev->udev, alt->desc.bInterfaceNumber,
 				alt->desc.bAlternateSetting);
 		if (tmp < 0)
 			return tmp;
 	}
 
-	dev->in = usb_rcvbulkpipe (dev->udev,
+	dev->in = usb_rcvbulkpipe(dev->udev,
 			in->desc.bEndpointAddress & USB_ENDPOINT_NUMBER_MASK);
-	dev->out = usb_sndbulkpipe (dev->udev,
+	dev->out = usb_sndbulkpipe(dev->udev,
 			out->desc.bEndpointAddress & USB_ENDPOINT_NUMBER_MASK);
 	dev->status = status;
 	return 0;
 }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-static void intr_complete (struct urb *urb, struct pt_regs *regs);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
+static void intr_complete(struct urb *urb, struct pt_regs *regs);
 #else
-static void intr_complete (struct urb *urb);
+static void intr_complete(struct urb *urb);
 #endif
 
-static int init_status (struct usbnet *dev, struct usb_interface *intf)
+static int init_status(struct usbnet *dev, struct usb_interface *intf)
 {
 	char		*buf = NULL;
 	unsigned	pipe = 0;
@@ -179,30 +181,30 @@ static int init_status (struct usbnet *dev, struct usb_interface *intf)
 	if (!dev->driver_info->status)
 		return 0;
 
-	pipe = usb_rcvintpipe (dev->udev,
+	pipe = usb_rcvintpipe(dev->udev,
 			dev->status->desc.bEndpointAddress
 				& USB_ENDPOINT_NUMBER_MASK);
-	maxp = usb_maxpacket (dev->udev, pipe, 0);
+	maxp = usb_maxpacket(dev->udev, pipe, 0);
 
 	/* avoid 1 msec chatter:  min 8 msec poll rate */
-	period = max ((int) dev->status->desc.bInterval,
+	period = max((int) dev->status->desc.bInterval,
 		(dev->udev->speed == USB_SPEED_HIGH) ? 7 : 3);
 
-	buf = kmalloc (maxp, GFP_KERNEL);
+	buf = kmalloc(maxp, GFP_KERNEL);
 	if (buf) {
-		dev->interrupt = usb_alloc_urb (0, GFP_KERNEL);
+		dev->interrupt = usb_alloc_urb(0, GFP_KERNEL);
 		if (!dev->interrupt) {
-			kfree (buf);
+			kfree(buf);
 			return -ENOMEM;
 		} else {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 14)
 			dev->interrupt->transfer_flags |= URB_ASYNC_UNLINK;
 #endif
 			usb_fill_int_urb(dev->interrupt, dev->udev, pipe,
 				buf, maxp, intr_complete, dev, period);
 			devdbg(dev,
-				"status ep%din, %d bytes period %d",
-				usb_pipeendpoint(pipe), maxp, period);
+			       "status ep%din, %d bytes period %d",
+			       usb_pipeendpoint(pipe), maxp, period);
 		}
 	}
 	return 0;
@@ -213,22 +215,22 @@ static int init_status (struct usbnet *dev, struct usb_interface *intf)
  * can return clones as well as just modify the original skb.
  */
 static
-void axusbnet_skb_return (struct usbnet *dev, struct sk_buff *skb)
+void axusbnet_skb_return(struct usbnet *dev, struct sk_buff *skb)
 {
 	int	status;
 
 	skb->dev = dev->net;
-	skb->protocol = eth_type_trans (skb, dev->net);
+	skb->protocol = eth_type_trans(skb, dev->net);
 	dev->stats.rx_packets++;
 	dev->stats.rx_bytes += skb->len;
 
-	if (netif_msg_rx_status (dev))
-		devdbg (dev, "< rx, len %zu, type 0x%x",
-			skb->len + sizeof (struct ethhdr), skb->protocol);
-	memset (skb->cb, 0, sizeof (struct skb_data));
-	status = netif_rx (skb);
-	if (status != NET_RX_SUCCESS && netif_msg_rx_err (dev))
-		devdbg (dev, "netif_rx status %d", status);
+	if (netif_msg_rx_status(dev))
+		devdbg(dev, "< rx, len %zu, type 0x%x",
+		       skb->len + sizeof(struct ethhdr), skb->protocol);
+	memset(skb->cb, 0, sizeof(struct skb_data));
+	status = netif_rx(skb);
+	if (status != NET_RX_SUCCESS && netif_msg_rx_err(dev))
+		devdbg(dev, "netif_rx status %d", status);
 }
 
 /*-------------------------------------------------------------------------
@@ -238,7 +240,7 @@ void axusbnet_skb_return (struct usbnet *dev, struct sk_buff *skb)
  *-------------------------------------------------------------------------*/
 
 static
-int axusbnet_change_mtu (struct net_device *net, int new_mtu)
+int axusbnet_change_mtu(struct net_device *net, int new_mtu)
 {
 	struct usbnet	*dev = netdev_priv(net);
 	int		ll_mtu = new_mtu + net->hard_header_len;
@@ -247,7 +249,7 @@ int axusbnet_change_mtu (struct net_device *net, int new_mtu)
 
 	if (new_mtu <= 0)
 		return -EINVAL;
-	// no second zero-length packet read wanted after mtu-sized packets
+	/* no second zero-length packet read wanted after mtu-sized packets */
 	if ((ll_mtu % dev->maxpacket) == 0)
 		return -EDOM;
 	net->mtu = new_mtu;
@@ -262,9 +264,9 @@ int axusbnet_change_mtu (struct net_device *net, int new_mtu)
 	return 0;
 }
 
-static struct net_device_stats *axusbnet_get_stats (struct net_device *net)
+static struct net_device_stats *axusbnet_get_stats(struct net_device *net)
 {
-	struct usbnet *dev = netdev_priv (net);
+	struct usbnet *dev = netdev_priv(net);
 	return &dev->stats;
 }
 
@@ -295,23 +297,23 @@ defer_bh(struct usbnet *dev, struct sk_buff *skb, struct sk_buff_head *list)
  * but tasklet_schedule() doesn't.  hope the failure is rare.
  */
 static
-void axusbnet_defer_kevent (struct usbnet *dev, int work)
+void axusbnet_defer_kevent(struct usbnet *dev, int work)
 {
-	set_bit (work, &dev->flags);
-	if (!schedule_work (&dev->kevent))
-		deverr (dev, "kevent %d may have been dropped", work);
+	set_bit(work, &dev->flags);
+	if (!schedule_work(&dev->kevent))
+		deverr(dev, "kevent %d may have been dropped", work);
 	else
-		devdbg (dev, "kevent %d scheduled", work);
+		devdbg(dev, "kevent %d scheduled", work);
 }
 
 /*-------------------------------------------------------------------------*/
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-static void rx_complete (struct urb *urb, struct pt_regs *regs);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
+static void rx_complete(struct urb *urb, struct pt_regs *regs);
 #else
-static void rx_complete (struct urb *urb);
+static void rx_complete(struct urb *urb);
 #endif
 
-static void rx_submit (struct usbnet *dev, struct urb *urb, gfp_t flags)
+static void rx_submit(struct usbnet *dev, struct urb *urb, gfp_t flags)
 {
 	struct sk_buff		*skb;
 	struct skb_data		*entry;
@@ -329,30 +331,31 @@ static void rx_submit (struct usbnet *dev, struct urb *urb, gfp_t flags)
 	else
 		align = 0;
 #endif
+	skb = alloc_skb(size + align, flags);
+	if (skb == NULL) {
 
-	if ((skb = alloc_skb (size + align, flags)) == NULL) {
+		if (netif_msg_rx_err(dev))
+			devdbg(dev, "no rx skb");
 
-		if (netif_msg_rx_err (dev))
-			devdbg (dev, "no rx skb");
-
-		if((dev->rx_urb_size > 2048) && dev->rx_size) {
+		if ((dev->rx_urb_size > 2048) && dev->rx_size) {
 			dev->rx_size--;
-			dev->rx_urb_size = AX88772B_BULKIN_SIZE[dev->rx_size].size;
+			dev->rx_urb_size =
+				AX88772B_BULKIN_SIZE[dev->rx_size].size;
 
-			ax8817x_write_cmd_async (dev, 0x2A,
+			ax8817x_write_cmd_async(dev, 0x2A,
 				AX88772B_BULKIN_SIZE[dev->rx_size].byte_cnt,
 				AX88772B_BULKIN_SIZE[dev->rx_size].threshold,
 				0, NULL);
 		}
 
 		if (!(dev->flags & EVENT_RX_MEMORY))
-			axusbnet_defer_kevent (dev, EVENT_RX_MEMORY);
-		usb_free_urb (urb);
+			axusbnet_defer_kevent(dev, EVENT_RX_MEMORY);
+		usb_free_urb(urb);
 		return;
 	}
 
 	if (align)
-		skb_reserve (skb, NET_IP_ALIGN);
+		skb_reserve(skb, NET_IP_ALIGN);
 
 	entry = (struct skb_data *) skb->cb;
 	entry->urb = urb;
@@ -360,73 +363,73 @@ static void rx_submit (struct usbnet *dev, struct urb *urb, gfp_t flags)
 	entry->state = rx_start;
 	entry->length = 0;
 
-	usb_fill_bulk_urb (urb, dev->udev, dev->in,
-		skb->data, size, rx_complete, skb);
+	usb_fill_bulk_urb(urb, dev->udev, dev->in, skb->data,
+			  size, rx_complete, skb);
 
-	spin_lock_irqsave (&dev->rxq.lock, lockflags);
+	spin_lock_irqsave(&dev->rxq.lock, lockflags);
 
-	if (netif_running (dev->net)
-			&& netif_device_present (dev->net)
-			&& !test_bit (EVENT_RX_HALT, &dev->flags)) {
-		switch (retval = usb_submit_urb (urb, GFP_ATOMIC)) {
+	if (netif_running(dev->net)
+			&& netif_device_present(dev->net)
+			&& !test_bit(EVENT_RX_HALT, &dev->flags)) {
+		switch (retval = usb_submit_urb(urb, GFP_ATOMIC)) {
 		case -EPIPE:
-			axusbnet_defer_kevent (dev, EVENT_RX_HALT);
+			axusbnet_defer_kevent(dev, EVENT_RX_HALT);
 			break;
 		case -ENOMEM:
-			axusbnet_defer_kevent (dev, EVENT_RX_MEMORY);
+			axusbnet_defer_kevent(dev, EVENT_RX_MEMORY);
 			break;
 		case -ENODEV:
-			if (netif_msg_ifdown (dev))
-				devdbg (dev, "device gone");
-			netif_device_detach (dev->net);
+			if (netif_msg_ifdown(dev))
+				devdbg(dev, "device gone");
+			netif_device_detach(dev->net);
 			break;
 		default:
-			if (netif_msg_rx_err (dev))
-				devdbg (dev, "rx submit, %d", retval);
-			tasklet_schedule (&dev->bh);
+			if (netif_msg_rx_err(dev))
+				devdbg(dev, "rx submit, %d", retval);
+			tasklet_schedule(&dev->bh);
 			break;
 		case 0:
-			__skb_queue_tail (&dev->rxq, skb);
+			__skb_queue_tail(&dev->rxq, skb);
 		}
 	} else {
-		if (netif_msg_ifdown (dev))
-			devdbg (dev, "rx: stopped");
+		if (netif_msg_ifdown(dev))
+			devdbg(dev, "rx: stopped");
 		retval = -ENOLINK;
 	}
-	spin_unlock_irqrestore (&dev->rxq.lock, lockflags);
+	spin_unlock_irqrestore(&dev->rxq.lock, lockflags);
 	if (retval) {
-		dev_kfree_skb_any (skb);
-		usb_free_urb (urb);
+		dev_kfree_skb_any(skb);
+		usb_free_urb(urb);
 	}
 }
 
 
 /*-------------------------------------------------------------------------*/
 
-static inline void rx_process (struct usbnet *dev, struct sk_buff *skb)
+static inline void rx_process(struct usbnet *dev, struct sk_buff *skb)
 {
 	if (dev->driver_info->rx_fixup
-			&& !dev->driver_info->rx_fixup (dev, skb))
+			&& !dev->driver_info->rx_fixup(dev, skb))
 		goto error;
-	// else network stack removes extra byte if we forced a short packet
+	/* else network stack removes extra byte if we forced a short packet */
 
 	if (skb->len)
-		axusbnet_skb_return (dev, skb);
+		axusbnet_skb_return(dev, skb);
 	else {
-		if (netif_msg_rx_err (dev))
-			devdbg (dev, "drop");
+		if (netif_msg_rx_err(dev))
+			devdbg(dev, "drop");
 error:
 		dev->stats.rx_errors++;
-		skb_queue_tail (&dev->done, skb);
+		skb_queue_tail(&dev->done, skb);
 	}
 }
 
 /*-------------------------------------------------------------------------*/
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-static void rx_complete (struct urb *urb, struct pt_regs *regs)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
+static void rx_complete(struct urb *urb, struct pt_regs *regs)
 #else
-static void rx_complete (struct urb *urb)
+static void rx_complete(struct urb *urb)
 #endif
 {
 	struct sk_buff		*skb = (struct sk_buff *) urb->context;
@@ -434,7 +437,7 @@ static void rx_complete (struct urb *urb)
 	struct usbnet		*dev = entry->dev;
 	int			urb_status = urb->status;
 
-	skb_put (skb, urb->actual_length);
+	skb_put(skb, urb->actual_length);
 	entry->state = rx_done;
 	entry->urb = NULL;
 
@@ -445,8 +448,8 @@ static void rx_complete (struct urb *urb)
 			entry->state = rx_cleanup;
 			dev->stats.rx_errors++;
 			dev->stats.rx_length_errors++;
-			if (netif_msg_rx_err (dev))
-				devdbg (dev, "rx length %d", skb->len);
+			if (netif_msg_rx_err(dev))
+				devdbg(dev, "rx length %d", skb->len);
 		}
 		break;
 
@@ -457,14 +460,14 @@ static void rx_complete (struct urb *urb)
 	 */
 	case -EPIPE:
 		dev->stats.rx_errors++;
-		axusbnet_defer_kevent (dev, EVENT_RX_HALT);
-		// FALLTHROUGH
+		axusbnet_defer_kevent(dev, EVENT_RX_HALT);
+		/* FALLTHROUGH */
 
 	/* software-driven interface shutdown */
 	case -ECONNRESET:		/* async unlink */
 	case -ESHUTDOWN:		/* hardware gone */
-		if (netif_msg_ifdown (dev))
-			devdbg (dev, "rx shutdown, code %d", urb_status);
+		if (netif_msg_ifdown(dev))
+			devdbg(dev, "rx shutdown, code %d", urb_status);
 		goto block;
 
 	/* we get controller i/o faults during khubd disconnect() delays.
@@ -475,10 +478,10 @@ static void rx_complete (struct urb *urb)
 	case -ETIME:
 	case -EILSEQ:
 		dev->stats.rx_errors++;
-		if (!timer_pending (&dev->delay)) {
-			mod_timer (&dev->delay, jiffies + THROTTLE_JIFFIES);
-			if (netif_msg_link (dev))
-				devdbg (dev, "rx throttle %d", urb_status);
+		if (!timer_pending(&dev->delay)) {
+			mod_timer(&dev->delay, jiffies + THROTTLE_JIFFIES);
+			if (netif_msg_link(dev))
+				devdbg(dev, "rx throttle %d", urb_status);
 		}
 block:
 		entry->state = rx_cleanup;
@@ -489,34 +492,34 @@ block:
 	/* data overrun ... flush fifo? */
 	case -EOVERFLOW:
 		dev->stats.rx_over_errors++;
-		// FALLTHROUGH
+		/* FALLTHROUGH */
 
 	default:
 		entry->state = rx_cleanup;
 		dev->stats.rx_errors++;
-		if (netif_msg_rx_err (dev))
-			devdbg (dev, "rx status %d", urb_status);
+		if (netif_msg_rx_err(dev))
+			devdbg(dev, "rx status %d", urb_status);
 		break;
 	}
 
 	defer_bh(dev, skb, &dev->rxq);
 
 	if (urb) {
-		if (netif_running (dev->net)
-				&& !test_bit (EVENT_RX_HALT, &dev->flags)) {
-			rx_submit (dev, urb, GFP_ATOMIC);
+		if (netif_running(dev->net) &&
+		    !test_bit(EVENT_RX_HALT, &dev->flags)) {
+			rx_submit(dev, urb, GFP_ATOMIC);
 			return;
 		}
-		usb_free_urb (urb);
+		usb_free_urb(urb);
 	}
-	if (netif_msg_rx_err (dev))
-		devdbg (dev, "no read resubmitted");
+	if (netif_msg_rx_err(dev))
+		devdbg(dev, "no read resubmitted");
 }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-static void intr_complete (struct urb *urb, struct pt_regs *regs)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
+static void intr_complete(struct urb *urb, struct pt_regs *regs)
 #else
-static void intr_complete (struct urb *urb)
+static void intr_complete(struct urb *urb)
 #endif
 {
 	struct usbnet	*dev = urb->context;
@@ -531,38 +534,38 @@ static void intr_complete (struct urb *urb)
 	/* software-driven interface shutdown */
 	case -ENOENT:		/* urb killed */
 	case -ESHUTDOWN:	/* hardware gone */
-		if (netif_msg_ifdown (dev))
-			devdbg (dev, "intr shutdown, code %d", status);
+		if (netif_msg_ifdown(dev))
+			devdbg(dev, "intr shutdown, code %d", status);
 		return;
 
 	/* NOTE:  not throttling like RX/TX, since this endpoint
 	 * already polls infrequently
 	 */
 	default:
-		devdbg (dev, "intr status %d", status);
+		devdbg(dev, "intr status %d", status);
 		break;
 	}
 
-	if (!netif_running (dev->net))
+	if (!netif_running(dev->net))
 		return;
 
 	memset(urb->transfer_buffer, 0, urb->transfer_buffer_length);
-	status = usb_submit_urb (urb, GFP_ATOMIC);
-	if (status != 0 && netif_msg_timer (dev))
+	status = usb_submit_urb(urb, GFP_ATOMIC);
+	if (status != 0 && netif_msg_timer(dev))
 		deverr(dev, "intr resubmit --> %d", status);
 }
 
 /*-------------------------------------------------------------------------*/
 
-// unlink pending rx/tx; completion handlers do all other cleanup
+/* unlink pending rx/tx; completion handlers do all other cleanup */
 
-static int unlink_urbs (struct usbnet *dev, struct sk_buff_head *q)
+static int unlink_urbs(struct usbnet *dev, struct sk_buff_head *q)
 {
 	unsigned long		flags;
 	struct sk_buff		*skb, *skbnext;
 	int			count = 0;
 
-	spin_lock_irqsave (&q->lock, flags);
+	spin_lock_irqsave(&q->lock, flags);
 	skb_queue_walk_safe(q, skb, skbnext) {
 		struct skb_data		*entry;
 		struct urb		*urb;
@@ -571,55 +574,54 @@ static int unlink_urbs (struct usbnet *dev, struct sk_buff_head *q)
 		entry = (struct skb_data *) skb->cb;
 		urb = entry->urb;
 
-		// during some PM-driven resume scenarios,
-		// these (async) unlinks complete immediately
-		retval = usb_unlink_urb (urb);
+		/* during some PM-driven resume scenarios, */
+		/* these (async) unlinks complete immediately */
+		retval = usb_unlink_urb(urb);
 		if (retval != -EINPROGRESS && retval != 0)
-			devdbg (dev, "unlink urb err, %d", retval);
+			devdbg(dev, "unlink urb err, %d", retval);
 		else
 			count++;
 	}
-	spin_unlock_irqrestore (&q->lock, flags);
+	spin_unlock_irqrestore(&q->lock, flags);
 	return count;
 }
 
-// Flush all pending rx urbs
-// minidrivers may need to do this when the MTU changes
+/* Flush all pending rx urbs */
+/* minidrivers may need to do this when the MTU changes */
 
 static
 void axusbnet_unlink_rx_urbs(struct usbnet *dev)
 {
 	if (netif_running(dev->net)) {
-		(void) unlink_urbs (dev, &dev->rxq);
+		(void) unlink_urbs(dev, &dev->rxq);
 		tasklet_schedule(&dev->bh);
 	}
 }
 
 /*-------------------------------------------------------------------------*/
 
-// precondition: never called in_interrupt
+/* precondition: never called in_interrupt */
 
 static
-int axusbnet_stop (struct net_device *net)
+int axusbnet_stop(struct net_device *net)
 {
 	struct usbnet		*dev = netdev_priv(net);
 	struct driver_info	*info = dev->driver_info;
 	int			temp;
 	int			retval;
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,18)
-	DECLARE_WAIT_QUEUE_HEAD_ONSTACK (unlink_wakeup);
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18)
+	DECLARE_WAIT_QUEUE_HEAD_ONSTACK(unlink_wakeup);
 #else
-	DECLARE_WAIT_QUEUE_HEAD (unlink_wakeup);
+	DECLARE_WAIT_QUEUE_HEAD(unlink_wakeup);
 #endif
-	DECLARE_WAITQUEUE (wait, current);
+	DECLARE_WAITQUEUE(wait, current);
 
-	netif_stop_queue (net);
+	netif_stop_queue(net);
 
-	if (netif_msg_ifdown (dev))
-		devinfo (dev, "stop stats: rx/tx %ld/%ld, errs %ld/%ld",
+	if (netif_msg_ifdown(dev))
+		devinfo(dev, "stop stats: rx/tx %ld/%ld, errs %ld/%ld",
 			dev->stats.rx_packets, dev->stats.tx_packets,
-			dev->stats.rx_errors, dev->stats.tx_errors
-			);
+			dev->stats.rx_errors, dev->stats.tx_errors);
 
 	/* allow minidriver to stop correctly (wireless devices to turn off
 	 * radio etc) */
@@ -647,7 +649,7 @@ int axusbnet_stop (struct net_device *net)
 			msleep(UNLINK_TIMEOUT_MS);
 			if (netif_msg_ifdown(dev))
 				devdbg(dev, "waited for %d urb completions",
-					temp);
+				       temp);
 		}
 		dev->wait = NULL;
 		remove_wait_queue(&unlink_wakeup, &wait);
@@ -660,55 +662,62 @@ int axusbnet_stop (struct net_device *net)
 	 * else workers could deadlock; so make workers a NOP.
 	 */
 	dev->flags = 0;
-	del_timer_sync (&dev->delay);
-	tasklet_kill (&dev->bh);
+	del_timer_sync(&dev->delay);
+	tasklet_kill(&dev->bh);
 
 	return 0;
 }
 
 /*-------------------------------------------------------------------------*/
 
-// posts reads, and enables write queuing
+/* posts reads, and enables write queuing */
 
-// precondition: never called in_interrupt
+/* precondition: never called in_interrupt */
 
 static
-int axusbnet_open (struct net_device *net)
+int axusbnet_open(struct net_device *net)
 {
 	struct usbnet		*dev = netdev_priv(net);
 	int			retval = 0;
 	struct driver_info	*info = dev->driver_info;
 
-	// put into "known safe" state
-	if (info->reset && (retval = info->reset (dev)) < 0) {
-		if (netif_msg_ifup (dev))
-			devinfo (dev,
-				"open reset fail (%d) usbnet usb-%s-%s, %s",
-				retval,
-				dev->udev->bus->bus_name, dev->udev->devpath,
-			info->description);
-		goto done;
+	/* put into "known safe" state */
+	if (info->reset) {
+		retval = info->reset(dev);
+		if (retval < 0) {
+			if (netif_msg_ifup(dev))
+				devinfo(dev,
+					"open reset fail (%d) usbnet usb-%s-%s, %s",
+					retval,
+					dev->udev->bus->bus_name,
+					dev->udev->devpath,
+					info->description);
+			goto done;
+		}
 	}
 
-	// insist peer be connected
-	if (info->check_connect && (retval = info->check_connect (dev)) < 0) {
-		if (netif_msg_ifup (dev))
-			devdbg (dev, "can't open; %d", retval);
-		goto done;
+	/* insist peer be connected */
+	if (info->check_connect) {
+		retval = info->check_connect(dev);
+		if (retval < 0) {
+			if (netif_msg_ifup(dev))
+				devdbg(dev, "can't open; %d", retval);
+			goto done;
+		}
 	}
 
 	/* start any status interrupt transfer */
 	if (dev->interrupt) {
-		retval = usb_submit_urb (dev->interrupt, GFP_KERNEL);
+		retval = usb_submit_urb(dev->interrupt, GFP_KERNEL);
 		if (retval < 0) {
-			if (netif_msg_ifup (dev))
-				deverr (dev, "intr submit %d", retval);
+			if (netif_msg_ifup(dev))
+				deverr(dev, "intr submit %d", retval);
 			goto done;
 		}
 	}
 
-	netif_start_queue (net);
-	if (netif_msg_ifup (dev)) {
+	netif_start_queue(net);
+	if (netif_msg_ifup(dev)) {
 		char	*framing;
 
 		if (dev->driver_info->flags & FLAG_FRAMING_NC)
@@ -724,14 +733,13 @@ int axusbnet_open (struct net_device *net)
 		else
 			framing = "simple";
 
-		devinfo (dev, "open: enable queueing "
-				"(rx %d, tx %d) mtu %d %s framing",
-			(int)RX_QLEN (dev), (int)TX_QLEN (dev), dev->net->mtu,
+		devinfo(dev, "open: enable queueing (rx %d, tx %d) mtu %d %s framing",
+			(int)RX_QLEN(dev), (int)TX_QLEN(dev), dev->net->mtu,
 			framing);
 	}
 
-	// delay posting reads until we're fully open
-	tasklet_schedule (&dev->bh);
+	/* delay posting reads until we're fully open */
+	tasklet_schedule(&dev->bh);
 	return retval;
 done:
 	return retval;
@@ -744,7 +752,7 @@ done:
  */
 
 static
-int axusbnet_get_settings (struct net_device *net, struct ethtool_cmd *cmd)
+int axusbnet_get_settings(struct net_device *net, struct ethtool_cmd *cmd)
 {
 	struct usbnet *dev = netdev_priv(net);
 
@@ -755,7 +763,7 @@ int axusbnet_get_settings (struct net_device *net, struct ethtool_cmd *cmd)
 }
 
 static
-int axusbnet_set_settings (struct net_device *net, struct ethtool_cmd *cmd)
+int axusbnet_set_settings(struct net_device *net, struct ethtool_cmd *cmd)
 {
 	struct usbnet *dev = netdev_priv(net);
 	int retval;
@@ -774,13 +782,13 @@ int axusbnet_set_settings (struct net_device *net, struct ethtool_cmd *cmd)
 }
 
 static
-u32 axusbnet_get_link (struct net_device *net)
+u32 axusbnet_get_link(struct net_device *net)
 {
 	struct usbnet *dev = netdev_priv(net);
 
 	/* If a check_connect is defined, return its result */
 	if (dev->driver_info->check_connect)
-		return dev->driver_info->check_connect (dev) == 0;
+		return dev->driver_info->check_connect(dev) == 0;
 
 	/* if the device has mii operations, use those */
 	if (dev->mii.mdio_read)
@@ -802,19 +810,19 @@ int axusbnet_nway_reset(struct net_device *net)
 }
 
 static
-void axusbnet_get_drvinfo (struct net_device *net, struct ethtool_drvinfo *info)
+void axusbnet_get_drvinfo(struct net_device *net, struct ethtool_drvinfo *info)
 {
 	struct usbnet *dev = netdev_priv(net);
 
-	strncpy (info->driver, dev->driver_name, sizeof info->driver);
-	strncpy (info->version, DRIVER_VERSION, sizeof info->version);
-	strncpy (info->fw_version, dev->driver_info->description,
-		sizeof info->fw_version);
-	usb_make_path (dev->udev, info->bus_info, sizeof info->bus_info);
+	strncpy(info->driver, dev->driver_name, sizeof(info->driver));
+	strncpy(info->version, DRIVER_VERSION, sizeof(info->version));
+	strncpy(info->fw_version, dev->driver_info->description,
+		sizeof(info->fw_version));
+	usb_make_path(dev->udev, info->bus_info, sizeof(info->bus_info));
 }
 
 static
-u32 axusbnet_get_msglevel (struct net_device *net)
+u32 axusbnet_get_msglevel(struct net_device *net)
 {
 	struct usbnet *dev = netdev_priv(net);
 
@@ -822,7 +830,7 @@ u32 axusbnet_get_msglevel (struct net_device *net)
 }
 
 static
-void axusbnet_set_msglevel (struct net_device *net, u32 level)
+void axusbnet_set_msglevel(struct net_device *net, u32 level)
 {
 	struct usbnet *dev = netdev_priv(net);
 
@@ -847,12 +855,12 @@ static struct ethtool_ops axusbnet_ethtool_ops = {
  * NOTE:  with 2.5 we could do more of this using completion callbacks,
  * especially now that control transfers can be queued.
  */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
-static void kevent (void *data)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
+static void kevent(void *data)
 {
 	struct usbnet *dev = (struct usbnet *)data;
 #else
-static void kevent (struct work_struct *work)
+static void kevent(struct work_struct *work)
 {
 	struct usbnet		*dev =
 		container_of(work, struct usbnet, kevent);
@@ -860,80 +868,85 @@ static void kevent (struct work_struct *work)
 	int			status;
 
 	/* usb_clear_halt() needs a thread context */
-	if (test_bit (EVENT_TX_HALT, &dev->flags)) {
+	if (test_bit(EVENT_TX_HALT, &dev->flags)) {
 
-		unlink_urbs (dev, &dev->txq);
-		status = usb_clear_halt (dev->udev, dev->out);
+		unlink_urbs(dev, &dev->txq);
+		status = usb_clear_halt(dev->udev, dev->out);
 		if (status < 0
 				&& status != -EPIPE
 				&& status != -ESHUTDOWN) {
-			if (netif_msg_tx_err (dev))
-				deverr (dev, "can't clear tx halt, status %d",
-					status);
+			if (netif_msg_tx_err(dev))
+				deverr(dev, "can't clear tx halt, status %d",
+				       status);
 		} else {
-			clear_bit (EVENT_TX_HALT, &dev->flags);
+			clear_bit(EVENT_TX_HALT, &dev->flags);
 			if (status != -ESHUTDOWN)
-				netif_wake_queue (dev->net);
+				netif_wake_queue(dev->net);
 		}
 	}
-	if (test_bit (EVENT_RX_HALT, &dev->flags)) {
+	if (test_bit(EVENT_RX_HALT, &dev->flags)) {
 
-		unlink_urbs (dev, &dev->rxq);
-		status = usb_clear_halt (dev->udev, dev->in);
+		unlink_urbs(dev, &dev->rxq);
+		status = usb_clear_halt(dev->udev, dev->in);
 		if (status < 0
 				&& status != -EPIPE
 				&& status != -ESHUTDOWN) {
-			if (netif_msg_rx_err (dev))
-				deverr (dev, "can't clear rx halt, status %d",
-					status);
+			if (netif_msg_rx_err(dev))
+				deverr(dev, "can't clear rx halt, status %d",
+				       status);
 		} else {
-			clear_bit (EVENT_RX_HALT, &dev->flags);
-			tasklet_schedule (&dev->bh);
+			clear_bit(EVENT_RX_HALT, &dev->flags);
+			tasklet_schedule(&dev->bh);
 		}
 	}
 
 	/* tasklet could resubmit itself forever if memory is tight */
-	if (test_bit (EVENT_RX_MEMORY, &dev->flags)) {
+	if (test_bit(EVENT_RX_MEMORY, &dev->flags)) {
 		struct urb	*urb = NULL;
 
-		if (netif_running (dev->net))
-			urb = usb_alloc_urb (0, GFP_KERNEL);
+		if (netif_running(dev->net))
+			urb = usb_alloc_urb(0, GFP_KERNEL);
 		else
-			clear_bit (EVENT_RX_MEMORY, &dev->flags);
+			clear_bit(EVENT_RX_MEMORY, &dev->flags);
 		if (urb != NULL) {
-			clear_bit (EVENT_RX_MEMORY, &dev->flags);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
+			clear_bit(EVENT_RX_MEMORY, &dev->flags);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 14)
 			urb->transfer_flags |= URB_ASYNC_UNLINK;
 #endif
-			rx_submit (dev, urb, GFP_KERNEL);
-			tasklet_schedule (&dev->bh);
+			rx_submit(dev, urb, GFP_KERNEL);
+			tasklet_schedule(&dev->bh);
 		}
 	}
 
-	if (test_bit (EVENT_LINK_RESET, &dev->flags)) {
+	if (test_bit(EVENT_LINK_RESET, &dev->flags)) {
 		struct driver_info	*info = dev->driver_info;
 		int			retval = 0;
 
-		clear_bit (EVENT_LINK_RESET, &dev->flags);
-		if(info->link_reset && (retval = info->link_reset(dev)) < 0) {
-			devinfo(dev, "link reset failed (%d) usbnet usb-%s-%s, %s",
-				retval,
-				dev->udev->bus->bus_name, dev->udev->devpath,
-				info->description);
+		clear_bit(EVENT_LINK_RESET, &dev->flags);
+
+		if (info->link_reset) {
+			retval = info->link_reset(dev);
+			if (retval < 0) {
+				devinfo(dev,
+					"link reset failed (%d) usbnet usb-%s-%s, %s",
+					retval,
+					dev->udev->bus->bus_name,
+					dev->udev->devpath,
+					info->description);
+			}
 		}
 	}
 
 	if (dev->flags)
-		devdbg (dev, "kevent done, flags = 0x%lx",
-			dev->flags);
+		devdbg(dev, "kevent done, flags = 0x%lx", dev->flags);
 }
 
 /*-------------------------------------------------------------------------*/
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-static void tx_complete (struct urb *urb, struct pt_regs *regs)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
+static void tx_complete(struct urb *urb, struct pt_regs *regs)
 #else
-static void tx_complete (struct urb *urb)
+static void tx_complete(struct urb *urb)
 #endif
 {
 	struct sk_buff		*skb = (struct sk_buff *) urb->context;
@@ -948,31 +961,31 @@ static void tx_complete (struct urb *urb)
 
 		switch (urb->status) {
 		case -EPIPE:
-			axusbnet_defer_kevent (dev, EVENT_TX_HALT);
+			axusbnet_defer_kevent(dev, EVENT_TX_HALT);
 			break;
 
 		/* software-driven interface shutdown */
-		case -ECONNRESET:		// async unlink
-		case -ESHUTDOWN:		// hardware gone
+		case -ECONNRESET:		/* async unlink */
+		case -ESHUTDOWN:		/* hardware gone */
 			break;
 
-		// like rx, tx gets controller i/o faults during khubd delays
-		// and so it uses the same throttling mechanism.
+		/* like rx, tx gets controller i/o faults during khubd delays */
+		/* and so it uses the same throttling mechanism. */
 		case -EPROTO:
 		case -ETIME:
 		case -EILSEQ:
-			if (!timer_pending (&dev->delay)) {
-				mod_timer (&dev->delay,
-					jiffies + THROTTLE_JIFFIES);
-				if (netif_msg_link (dev))
-					devdbg (dev, "tx throttle %d",
-							urb->status);
+			if (!timer_pending(&dev->delay)) {
+				mod_timer(&dev->delay,
+					  jiffies + THROTTLE_JIFFIES);
+				if (netif_msg_link(dev))
+					devdbg(dev, "tx throttle %d",
+					       urb->status);
 			}
-			netif_stop_queue (dev->net);
+			netif_stop_queue(dev->net);
 			break;
 		default:
-			if (netif_msg_tx_err (dev))
-				devdbg (dev, "tx err %d", entry->urb->status);
+			if (netif_msg_tx_err(dev))
+				devdbg(dev, "tx err %d", entry->urb->status);
 			break;
 		}
 	}
@@ -985,24 +998,23 @@ static void tx_complete (struct urb *urb)
 /*-------------------------------------------------------------------------*/
 
 static
-void axusbnet_tx_timeout (struct net_device *net)
+void axusbnet_tx_timeout(struct net_device *net)
 {
-	struct usbnet		*dev = netdev_priv(net);
+	struct usbnet *dev = netdev_priv(net);
 
-	unlink_urbs (dev, &dev->txq);
-	tasklet_schedule (&dev->bh);
+	unlink_urbs(dev, &dev->txq);
+	tasklet_schedule(&dev->bh);
 
-	// FIXME: device recovery -- reset?
+	/* FIXME: device recovery -- reset? */
 }
 
 /*-------------------------------------------------------------------------*/
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,32)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 32)
 static int
 #else
 static netdev_tx_t
 #endif
-axusbnet_start_xmit (struct sk_buff *skb,
-				     struct net_device *net)
+axusbnet_start_xmit(struct sk_buff *skb, struct net_device *net)
 {
 	struct usbnet		*dev = netdev_priv(net);
 	int			length;
@@ -1012,21 +1024,22 @@ axusbnet_start_xmit (struct sk_buff *skb,
 	unsigned long		flags;
 	int retval;
 
-	// some devices want funky USB-level framing, for
-	// win32 driver (usually) and/or hardware quirks
+	/* some devices want funky USB-level framing, for */
+	/* win32 driver (usually) and/or hardware quirks */
 	if (info->tx_fixup) {
-		skb = info->tx_fixup (dev, skb, GFP_ATOMIC);
+		skb = info->tx_fixup(dev, skb, GFP_ATOMIC);
 		if (!skb) {
-			if (netif_msg_tx_err (dev))
-				devdbg (dev, "can't tx_fixup skb");
+			if (netif_msg_tx_err(dev))
+				devdbg(dev, "can't tx_fixup skb");
 			goto drop;
 		}
 	}
 	length = skb->len;
 
-	if (!(urb = usb_alloc_urb (0, GFP_ATOMIC))) {
-		if (netif_msg_tx_err (dev))
-			devdbg (dev, "no urb");
+	urb = usb_alloc_urb(0, GFP_ATOMIC);
+	if (!urb) {
+		if (netif_msg_tx_err(dev))
+			devdbg(dev, "no urb");
 		goto drop;
 	}
 
@@ -1036,8 +1049,8 @@ axusbnet_start_xmit (struct sk_buff *skb,
 	entry->state = tx_start;
 	entry->length = length;
 
-	usb_fill_bulk_urb (urb, dev->udev, dev->out,
-			skb->data, skb->len, tx_complete, skb);
+	usb_fill_bulk_urb(urb, dev->udev, dev->out, skb->data,
+			  skb->len, tx_complete, skb);
 
 	/* don't assume the hardware handles USB_ZERO_PACKET
 	 * NOTE:  strictly conforming cdc-ether devices should expect
@@ -1051,103 +1064,102 @@ axusbnet_start_xmit (struct sk_buff *skb,
 		}
 	}
 
-	spin_lock_irqsave (&dev->txq.lock, flags);
+	spin_lock_irqsave(&dev->txq.lock, flags);
 
-	switch ((retval = usb_submit_urb (urb, GFP_ATOMIC))) {
+	switch ((retval = usb_submit_urb(urb, GFP_ATOMIC))) {
 	case -EPIPE:
-		netif_stop_queue (net);
-		axusbnet_defer_kevent (dev, EVENT_TX_HALT);
+		netif_stop_queue(net);
+		axusbnet_defer_kevent(dev, EVENT_TX_HALT);
 		break;
 	default:
-		if (netif_msg_tx_err (dev))
-			devdbg (dev, "tx: submit urb err %d", retval);
+		if (netif_msg_tx_err(dev))
+			devdbg(dev, "tx: submit urb err %d", retval);
 		break;
 	case 0:
 		net->trans_start = jiffies;
-		__skb_queue_tail (&dev->txq, skb);
-		if (dev->txq.qlen >= TX_QLEN (dev))
-			netif_stop_queue (net);
+		__skb_queue_tail(&dev->txq, skb);
+		if (dev->txq.qlen >= TX_QLEN(dev))
+			netif_stop_queue(net);
 	}
-	spin_unlock_irqrestore (&dev->txq.lock, flags);
+	spin_unlock_irqrestore(&dev->txq.lock, flags);
 
 	if (retval) {
-		if (netif_msg_tx_err (dev))
-			devdbg (dev, "drop, code %d", retval);
+		if (netif_msg_tx_err(dev))
+			devdbg(dev, "drop, code %d", retval);
 drop:
 		dev->stats.tx_dropped++;
 		if (skb)
-			dev_kfree_skb_any (skb);
-		usb_free_urb (urb);
-	} else if (netif_msg_tx_queued (dev)) {
-		devdbg (dev, "> tx, len %d, type 0x%x",
-			length, skb->protocol);
+			dev_kfree_skb_any(skb);
+		usb_free_urb(urb);
+	} else if (netif_msg_tx_queued(dev)) {
+		devdbg(dev, "> tx, len %d, type 0x%x",
+		       length, skb->protocol);
 	}
 	return NETDEV_TX_OK;
 }
 
 /*-------------------------------------------------------------------------*/
 
-// tasklet (work deferred from completions, in_irq) or timer
+/* tasklet (work deferred from completions, in_irq) or timer */
 
-static void axusbnet_bh (unsigned long param)
+static void axusbnet_bh(unsigned long param)
 {
 	struct usbnet		*dev = (struct usbnet *) param;
 	struct sk_buff		*skb;
 	struct skb_data		*entry;
 
-	while ((skb = skb_dequeue (&dev->done))) {
+	while ((skb = skb_dequeue(&dev->done))) {
 		entry = (struct skb_data *) skb->cb;
 		switch (entry->state) {
 		case rx_done:
 			entry->state = rx_cleanup;
-			rx_process (dev, skb);
+			rx_process(dev, skb);
 			continue;
 		case tx_done:
 		case rx_cleanup:
-			usb_free_urb (entry->urb);
-			dev_kfree_skb (skb);
+			usb_free_urb(entry->urb);
+			dev_kfree_skb(skb);
 			continue;
 		default:
-			devdbg (dev, "bogus skb state %d", entry->state);
+			devdbg(dev, "bogus skb state %d", entry->state);
 		}
 	}
 
-	// waiting for all pending urbs to complete?
+	/* waiting for all pending urbs to complete? */
 	if (dev->wait) {
-		if ((dev->txq.qlen + dev->rxq.qlen + dev->done.qlen) == 0) {
-			wake_up (dev->wait);
-		}
-
-	// or are we maybe short a few urbs?
-	} else if (netif_running (dev->net)
-			&& netif_device_present (dev->net)
-			&& !timer_pending (&dev->delay)
-			&& !test_bit (EVENT_RX_HALT, &dev->flags)) {
+		if ((dev->txq.qlen + dev->rxq.qlen + dev->done.qlen) == 0)
+			wake_up(dev->wait);
+
+	/* or are we maybe short a few urbs? */
+	} else if (netif_running(dev->net)
+			&& netif_device_present(dev->net)
+			&& !timer_pending(&dev->delay)
+			&& !test_bit(EVENT_RX_HALT, &dev->flags)) {
 		int	temp = dev->rxq.qlen;
-		int	qlen = RX_QLEN (dev);
+		int	qlen = RX_QLEN(dev);
 
 		if (temp < qlen) {
 			struct urb	*urb;
 			int		i;
 
-			// don't refill the queue all at once
+			/* don't refill the queue all at once */
 			for (i = 0; i < 10 && dev->rxq.qlen < qlen; i++) {
-				urb = usb_alloc_urb (0, GFP_ATOMIC);
+				urb = usb_alloc_urb(0, GFP_ATOMIC);
 				if (urb != NULL) {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 14)
 					urb->transfer_flags |= URB_ASYNC_UNLINK;
 #endif
-					rx_submit (dev, urb, GFP_ATOMIC);
+					rx_submit(dev, urb, GFP_ATOMIC);
 				}
 			}
-			if (temp != dev->rxq.qlen && netif_msg_link (dev))
-				devdbg (dev, "rxqlen %d --> %d",
-						temp, dev->rxq.qlen);
+			if (temp != dev->rxq.qlen && netif_msg_link(dev))
+				devdbg(dev, "rxqlen %d --> %d",
+				       temp, dev->rxq.qlen);
 			if (dev->rxq.qlen < qlen)
-				tasklet_schedule (&dev->bh);
+				tasklet_schedule(&dev->bh);
 		}
-		if (dev->txq.qlen < TX_QLEN (dev))
-			netif_wake_queue (dev->net);
+		if (dev->txq.qlen < TX_QLEN(dev))
+			netif_wake_queue(dev->net);
 	}
 }
 
@@ -1158,10 +1170,10 @@ static void axusbnet_bh (unsigned long param)
  *
  *-------------------------------------------------------------------------*/
 
-// precondition: never called in_interrupt
+/* precondition: never called in_interrupt */
 
 static
-void axusbnet_disconnect (struct usb_interface *intf)
+void axusbnet_disconnect(struct usb_interface *intf)
 {
 	struct usbnet		*dev;
 	struct usb_device	*xdev;
@@ -1172,33 +1184,33 @@ void axusbnet_disconnect (struct usb_interface *intf)
 	if (!dev)
 		return;
 
-	xdev = interface_to_usbdev (intf);
+	xdev = interface_to_usbdev(intf);
 
-	if (netif_msg_probe (dev))
-		devinfo (dev, "unregister '%s' usb-%s-%s, %s",
+	if (netif_msg_probe(dev))
+		devinfo(dev, "unregister '%s' usb-%s-%s, %s",
 			intf->dev.driver->name,
 			xdev->bus->bus_name, xdev->devpath,
 			dev->driver_info->description);
 
 	net = dev->net;
-	unregister_netdev (net);
+	unregister_netdev(net);
 
 	/* we don't hold rtnl here ... */
-	flush_scheduled_work ();
+	flush_scheduled_work();
 
 	if (dev->driver_info->unbind)
-		dev->driver_info->unbind (dev, intf);
+		dev->driver_info->unbind(dev, intf);
 
 	free_netdev(net);
-	usb_put_dev (xdev);
+	usb_put_dev(xdev);
 }
 
 /*-------------------------------------------------------------------------*/
 
-// precondition: never called in_interrupt
+/* precondition: never called in_interrupt */
 
 static int
-axusbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
+axusbnet_probe(struct usb_interface *udev, const struct usb_device_id *prod)
 {
 	struct usbnet			*dev;
 	struct net_device		*net;
@@ -1211,20 +1223,20 @@ axusbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
 	name = udev->dev.driver->name;
 	info = (struct driver_info *) prod->driver_info;
 	if (!info) {
-		printk (KERN_ERR "blacklisted by %s\n", name);
+		printk(KERN_ERR "blacklisted by %s\n", name);
 		return -ENODEV;
 	}
-	xdev = interface_to_usbdev (udev);
+	xdev = interface_to_usbdev(udev);
 	interface = udev->cur_altsetting;
 
-	usb_get_dev (xdev);
+	usb_get_dev(xdev);
 
 	status = -ENOMEM;
 
-	// set up our own records
+	/* set up our own records */
 	net = alloc_etherdev(sizeof(*dev));
 	if (!net) {
-		dbg ("can't kmalloc dev");
+		printk(KERN_ERR "can't kmalloc dev");
 		goto out;
 	}
 
@@ -1233,23 +1245,23 @@ axusbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
 	dev->intf = udev;
 	dev->driver_info = info;
 	dev->driver_name = name;
-	dev->msg_enable = netif_msg_init (msg_level, NETIF_MSG_DRV
-				| NETIF_MSG_PROBE | NETIF_MSG_LINK);
-	skb_queue_head_init (&dev->rxq);
-	skb_queue_head_init (&dev->txq);
-	skb_queue_head_init (&dev->done);
+	dev->msg_enable = netif_msg_init(msg_level, NETIF_MSG_DRV |
+					 NETIF_MSG_PROBE | NETIF_MSG_LINK);
+	skb_queue_head_init(&dev->rxq);
+	skb_queue_head_init(&dev->txq);
+	skb_queue_head_init(&dev->done);
 	dev->bh.func = axusbnet_bh;
 	dev->bh.data = (unsigned long) dev;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
-	INIT_WORK (&dev->kevent, kevent, dev);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
+	INIT_WORK(&dev->kevent, kevent, dev);
 #else
-	INIT_WORK (&dev->kevent, kevent);
+	INIT_WORK(&dev->kevent, kevent);
 #endif
 
 	dev->delay.function = axusbnet_bh;
 	dev->delay.data = (unsigned long) dev;
-	init_timer (&dev->delay);
-//	mutex_init (&dev->phy_mutex);
+	init_timer(&dev->delay);
+	/* mutex_init(&dev->phy_mutex); */
 
 	dev->net = net;
 
@@ -1259,13 +1271,13 @@ axusbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
 	dev->hard_mtu = net->mtu + net->hard_header_len;
 
 #if 0
-// dma_supported() is deeply broken on almost all architectures
-	// possible with some EHCI controllers
-	if (dma_supported (&udev->dev, DMA_BIT_MASK(64)))
+	/* dma_supported() is deeply broken on almost all architectures */
+	/* possible with some EHCI controllers */
+	if (dma_supported(&udev->dev, DMA_BIT_MASK(64)))
 		net->features |= NETIF_F_HIGHDMA;
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30)
 	net->open		= axusbnet_open,
 	net->stop		= axusbnet_stop,
 	net->hard_start_xmit	= axusbnet_start_xmit,
@@ -1276,9 +1288,9 @@ axusbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
 	net->watchdog_timeo = TX_TIMEOUT_JIFFIES;
 	net->ethtool_ops = &axusbnet_ethtool_ops;
 
-	// allow device-specific bind/init procedures
-	// NOTE net->name still not usable ...
-	status = info->bind (dev, udev);
+	/* allow device-specific bind/init procedures */
+	/* NOTE net->name still not usable ... */
+	status = info->bind(dev, udev);
 	if (status < 0) {
 		deverr(dev, "Binding device failed: %d", status);
 		goto out1;
@@ -1288,39 +1300,39 @@ axusbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
 	if (net->mtu > (dev->hard_mtu - net->hard_header_len))
 		net->mtu = dev->hard_mtu - net->hard_header_len;
 
-	status = init_status (dev, udev);
+	status = init_status(dev, udev);
 	if (status < 0)
 		goto out3;
 
 	if (!dev->rx_urb_size)
 		dev->rx_urb_size = dev->hard_mtu;
-	dev->maxpacket = usb_maxpacket (dev->udev, dev->out, 1);
+	dev->maxpacket = usb_maxpacket(dev->udev, dev->out, 1);
 
 	SET_NETDEV_DEV(net, &udev->dev);
-	status = register_netdev (net);
+	status = register_netdev(net);
 	if (status) {
 		deverr(dev, "net device registration failed: %d", status);
 		goto out3;
 	}
 
-	if (netif_msg_probe (dev))
-		devinfo (dev, "register '%s' at usb-%s-%s, %s, %pM",
+	if (netif_msg_probe(dev))
+		devinfo(dev, "register '%s' at usb-%s-%s, %s, %pM",
 			udev->dev.driver->name,
 			xdev->bus->bus_name, xdev->devpath,
 			dev->driver_info->description,
 			net->dev_addr);
 
-	// ok, it's ready to go.
-	usb_set_intfdata (udev, dev);
+	/* ok, it's ready to go. */
+	usb_set_intfdata(udev, dev);
 
-	// start as if the link is up
-	netif_device_attach (net);
+	/* start as if the link is up */
+	netif_device_attach(net);
 
 	return 0;
 
 out3:
 	if (info->unbind)
-		info->unbind (dev, udev);
+		info->unbind(dev, udev);
 out1:
 	free_netdev(net);
 out:
@@ -1335,40 +1347,52 @@ out:
  * resume only when the last interface is resumed
  */
 
-static int axusbnet_suspend (struct usb_interface *intf,
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,10)
+static int axusbnet_suspend(struct usb_interface *intf,
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 10)
 pm_message_t message)
 #else
 u32 message)
 #endif
 {
-	struct usbnet		*dev = usb_get_intfdata(intf);
+	struct usbnet *dev = usb_get_intfdata(intf);
 
 	if (!dev->suspend_count++) {
 		/*
 		 * accelerate emptying of the rx and queues, to avoid
 		 * having everything error out.
 		 */
-		netif_device_detach (dev->net);
-		(void) unlink_urbs (dev, &dev->rxq);
-		(void) unlink_urbs (dev, &dev->txq);
+		netif_device_detach(dev->net);
+		(void) unlink_urbs(dev, &dev->rxq);
+		(void) unlink_urbs(dev, &dev->txq);
+		usb_kill_urb(dev->interrupt);
 		/*
 		 * reattach so runtime management can use and
 		 * wake the device
 		 */
-		netif_device_attach (dev->net);
+		netif_device_attach(dev->net);
 	}
 	return 0;
 }
 
 static int
-axusbnet_resume (struct usb_interface *intf)
+axusbnet_resume(struct usb_interface *intf)
 {
-	struct usbnet		*dev = usb_get_intfdata(intf);
+	struct usbnet	*dev = usb_get_intfdata(intf);
+	int	retval = 0;
 
 	if (!--dev->suspend_count)
-		tasklet_schedule (&dev->bh);
+		tasklet_schedule(&dev->bh);
 
-	return 0;
+	retval = init_status(dev, intf);
+	if (retval < 0)
+		return retval;
+
+	if (dev->interrupt) {
+		retval = usb_submit_urb(dev->interrupt, GFP_KERNEL);
+		if (retval < 0 && netif_msg_ifup(dev))
+			deverr(dev, "intr submit %d", retval);
+	}
+
+	return retval;
 }