tizen 2.3.1 release
[platform/kernel/u-boot.git] / drivers / usb / gadget / rndis.c
index 404a7b9..f7689c9 100644 (file)
@@ -1,6 +1,8 @@
 /*
  * RNDIS MSG parser
  *
+ * Version:     $Id: rndis.c,v 1.19 2004/03/25 21:33:46 robert Exp $
+ *
  * Authors:    Benedikt Spranger, Pengutronix
  *             Robert Schwebel, Pengutronix
  *
  *             updates to merge with Linux 2.6, better match RNDIS spec
  */
 
-#include <common.h>
-#include <net.h>
-#include <malloc.h>
-#include <linux/types.h>
+/*#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/init.h>*/
 #include <linux/list.h>
-#include <linux/netdevice.h>
+/*#include <linux/proc_fs.h>
+#include <linux/netdevice.h>*/
+#include <asm/errno.h>
 
+#include <asm/io.h>
 #include <asm/byteorder.h>
+#include <asm/system.h>
 #include <asm/unaligned.h>
-#include <asm/errno.h>
+
+#include <malloc.h>
+
 
 #undef RNDIS_PM
 #undef RNDIS_WAKEUP
 #undef VERBOSE
+#define ENOTSUPP       524
+#define ETH_ALEN       6 /* copied from ether.c */
 
-#include "rndis.h"
+#define netif_running(...)     1
+#define netif_carrier_on(...) eth_connection_established()
+#define netif_wake_queue(...) do { } while(0)
+#define netif_carrier_off(...) do { } while(0)
+#define netif_stop_queue(...) do { } while(0)
 
-#define ETH_ALEN       6               /* Octets in one ethernet addr   */
-#define ETH_HLEN       14              /* Total octets in header.       */
-#define ETH_ZLEN       60              /* Min. octets in frame sans FCS */
-#define ETH_DATA_LEN   1500            /* Max. octets in payload        */
-#define ETH_FRAME_LEN  PKTSIZE_ALIGN   /* Max. octets in frame sans FCS */
-#define ETH_FCS_LEN    4               /* Octets in the FCS             */
-#define ENOTSUPP        524     /* Operation is not supported */
+#include "rndis.h"
 
 
-/*
- * The driver for your USB chip needs to support ep0 OUT to work with
+/* The driver for your USB chip needs to support ep0 OUT to work with
  * RNDIS, plus all three CDC Ethernet endpoints (interrupt not optional).
  *
  * Windows hosts need an INF file like Documentation/usb/linux.inf
  * and will be happier if you provide the host_addr module parameter.
  */
 
+#define rndis_debug            0
+
+#define DBG(str,args...) do { \
+       if (rndis_debug) \
+               printf(str , ## args); \
+       } while (0)
+
 #define RNDIS_MAX_CONFIGS      1
 
-static rndis_params rndis_per_dev_params[RNDIS_MAX_CONFIGS];
+static rndis_packet_buffer rndis_buffer = {
+       .len = 0,
+       .in_use = 0
+};
+
+
+static rndis_params rndis_per_dev_params [RNDIS_MAX_CONFIGS];
 
 /* Driver Version */
-static const __le32 rndis_driver_version = __constant_cpu_to_le32(1);
+static const __le32 rndis_driver_version = __constant_cpu_to_le32 (1);
 
 /* Function Prototypes */
-static rndis_resp_t *rndis_add_response(int configNr, u32 length);
+static rndis_resp_t *rndis_add_response (int configNr, u32 length);
 
 
 /* supported OIDs */
-static const u32 oid_supported_list[] = {
+static const u32 oid_supported_list [] =
+{
        /* the general stuff */
        OID_GEN_SUPPORTED_LIST,
        OID_GEN_HARDWARE_STATUS,
@@ -152,140 +174,140 @@ static const u32 oid_supported_list[] = {
 
 
 /* NDIS Functions */
-static int gen_ndis_query_resp(int configNr, u32 OID, u8 *buf,
-                               unsigned buf_len, rndis_resp_t *r)
+static int
+gen_ndis_query_resp (int configNr, u32 OID, u8 *buf, unsigned buf_len,
+               rndis_resp_t *r)
 {
-       int                             retval = -ENOTSUPP;
-       u32                             length = 4;     /* usually */
-       __le32                          *outbuf;
-       int                             i, count;
-       rndis_query_cmplt_type          *resp;
-       rndis_params                    *params;
+       int                     retval = -ENOTSUPP;
+       u32                     length = 4;     /* usually */
+       __le32                  *outbuf;
+       int                     i, count;
+       rndis_query_cmplt_type  *resp;
 
-       if (!r)
-               return -ENOMEM;
+       if (!r) return -ENOMEM;
        resp = (rndis_query_cmplt_type *) r->buf;
 
-       if (!resp)
-               return -ENOMEM;
+       if (!resp) return -ENOMEM;
 
-#if defined(DEBUG) && defined(DEBUG_VERBOSE)
-       if (buf_len) {
-               debug("query OID %08x value, len %d:\n", OID, buf_len);
+       if (buf_len && rndis_debug > 1) {
+               DBG("query OID %08x value, len %d:\n", OID, buf_len);
                for (i = 0; i < buf_len; i += 16) {
-                       debug("%03d: %08x %08x %08x %08x\n", i,
+                       DBG("%03d: %08x %08x %08x %08x\n", i,
                                get_unaligned_le32(&buf[i]),
                                get_unaligned_le32(&buf[i + 4]),
                                get_unaligned_le32(&buf[i + 8]),
                                get_unaligned_le32(&buf[i + 12]));
                }
        }
-#endif
 
        /* response goes here, right after the header */
        outbuf = (__le32 *) &resp[1];
-       resp->InformationBufferOffset = __constant_cpu_to_le32(16);
+       resp->InformationBufferOffset = __constant_cpu_to_le32 (16);
 
-       params = &rndis_per_dev_params[configNr];
        switch (OID) {
 
        /* general oids (table 4-1) */
 
        /* mandatory */
        case OID_GEN_SUPPORTED_LIST:
-               debug("%s: OID_GEN_SUPPORTED_LIST\n", __func__);
-               length = sizeof(oid_supported_list);
-               count  = length / sizeof(u32);
+               DBG("%s: OID_GEN_SUPPORTED_LIST\n", __func__);
+               length = sizeof (oid_supported_list);
+               count  = length / sizeof (u32);
                for (i = 0; i < count; i++)
-                       outbuf[i] = cpu_to_le32(oid_supported_list[i]);
+                       outbuf[i] = cpu_to_le32 (oid_supported_list[i]);
                retval = 0;
                break;
 
        /* mandatory */
        case OID_GEN_HARDWARE_STATUS:
-               debug("%s: OID_GEN_HARDWARE_STATUS\n", __func__);
-               /*
-                * Bogus question!
+               DBG("%s: OID_GEN_HARDWARE_STATUS\n", __func__);
+               /* Bogus question!
                 * Hardware must be ready to receive high level protocols.
                 * BTW:
                 * reddite ergo quae sunt Caesaris Caesari
                 * et quae sunt Dei Deo!
                 */
-               *outbuf = __constant_cpu_to_le32(0);
+               *outbuf = __constant_cpu_to_le32 (0);
                retval = 0;
                break;
 
        /* mandatory */
        case OID_GEN_MEDIA_SUPPORTED:
-               debug("%s: OID_GEN_MEDIA_SUPPORTED\n", __func__);
-               *outbuf = cpu_to_le32(params->medium);
+               DBG("%s: OID_GEN_MEDIA_SUPPORTED\n", __func__);
+               *outbuf = cpu_to_le32 (rndis_per_dev_params [configNr].medium);
                retval = 0;
                break;
 
        /* mandatory */
        case OID_GEN_MEDIA_IN_USE:
-               debug("%s: OID_GEN_MEDIA_IN_USE\n", __func__);
+               DBG("%s: OID_GEN_MEDIA_IN_USE\n", __func__);
                /* one medium, one transport... (maybe you do it better) */
-               *outbuf = cpu_to_le32(params->medium);
+               *outbuf = cpu_to_le32 (rndis_per_dev_params [configNr].medium);
                retval = 0;
                break;
 
        /* mandatory */
        case OID_GEN_MAXIMUM_FRAME_SIZE:
-               debug("%s: OID_GEN_MAXIMUM_FRAME_SIZE\n", __func__);
-               if (params->dev) {
-                       *outbuf = cpu_to_le32(params->mtu);
+               DBG("%s: OID_GEN_MAXIMUM_FRAME_SIZE\n", __func__);
+               if (rndis_per_dev_params [configNr].dev) {
+                       *outbuf = cpu_to_le32 (
+                               rndis_per_dev_params [configNr].dev->mtu);
                        retval = 0;
                }
                break;
 
        /* mandatory */
        case OID_GEN_LINK_SPEED:
-#if defined(DEBUG) && defined(DEBUG_VERBOSE)
-               debug("%s: OID_GEN_LINK_SPEED\n", __func__);
-#endif
-               if (params->media_state == NDIS_MEDIA_STATE_DISCONNECTED)
-                       *outbuf = __constant_cpu_to_le32(0);
+               if (rndis_debug > 1)
+                       DBG("%s: OID_GEN_LINK_SPEED\n", __func__);
+               if (rndis_per_dev_params [configNr].media_state
+                               == NDIS_MEDIA_STATE_DISCONNECTED)
+                       *outbuf = __constant_cpu_to_le32 (0);
                else
-                       *outbuf = cpu_to_le32(params->speed);
+                       *outbuf = cpu_to_le32 (
+                               rndis_per_dev_params [configNr].speed);
                retval = 0;
                break;
 
        /* mandatory */
        case OID_GEN_TRANSMIT_BLOCK_SIZE:
-               debug("%s: OID_GEN_TRANSMIT_BLOCK_SIZE\n", __func__);
-               if (params->dev) {
-                       *outbuf = cpu_to_le32(params->mtu);
+               DBG("%s: OID_GEN_TRANSMIT_BLOCK_SIZE\n", __func__);
+               if (rndis_per_dev_params [configNr].dev) {
+                       *outbuf = cpu_to_le32 (
+                               rndis_per_dev_params [configNr].dev->mtu);
                        retval = 0;
                }
                break;
 
        /* mandatory */
        case OID_GEN_RECEIVE_BLOCK_SIZE:
-               debug("%s: OID_GEN_RECEIVE_BLOCK_SIZE\n", __func__);
-               if (params->dev) {
-                       *outbuf = cpu_to_le32(params->mtu);
+               DBG("%s: OID_GEN_RECEIVE_BLOCK_SIZE\n", __func__);
+               if (rndis_per_dev_params [configNr].dev) {
+                       *outbuf = cpu_to_le32 (
+                               rndis_per_dev_params [configNr].dev->mtu);
                        retval = 0;
                }
                break;
 
        /* mandatory */
        case OID_GEN_VENDOR_ID:
-               debug("%s: OID_GEN_VENDOR_ID\n", __func__);
-               *outbuf = cpu_to_le32(params->vendorID);
+               DBG("%s: OID_GEN_VENDOR_ID\n", __func__);
+               *outbuf = cpu_to_le32 (
+                       rndis_per_dev_params [configNr].vendorID);
                retval = 0;
                break;
 
        /* mandatory */
        case OID_GEN_VENDOR_DESCRIPTION:
-               debug("%s: OID_GEN_VENDOR_DESCRIPTION\n", __func__);
-               length = strlen(params->vendorDescr);
-               memcpy(outbuf, params->vendorDescr, length);
+               DBG("%s: OID_GEN_VENDOR_DESCRIPTION\n", __func__);
+               length = strlen (rndis_per_dev_params [configNr].vendorDescr);
+               memcpy (outbuf,
+                       rndis_per_dev_params [configNr].vendorDescr, length);
                retval = 0;
                break;
 
        case OID_GEN_VENDOR_DRIVER_VERSION:
-               debug("%s: OID_GEN_VENDOR_DRIVER_VERSION\n", __func__);
+               DBG("%s: OID_GEN_VENDOR_DRIVER_VERSION\n", __func__);
                /* Created as LE */
                *outbuf = rndis_driver_version;
                retval = 0;
@@ -293,43 +315,42 @@ static int gen_ndis_query_resp(int configNr, u32 OID, u8 *buf,
 
        /* mandatory */
        case OID_GEN_CURRENT_PACKET_FILTER:
-               debug("%s: OID_GEN_CURRENT_PACKET_FILTER\n", __func__);
-               *outbuf = cpu_to_le32(*params->filter);
+               DBG("%s: OID_GEN_CURRENT_PACKET_FILTER\n", __func__);
+               *outbuf = cpu_to_le32 (*rndis_per_dev_params[configNr].filter);
                retval = 0;
                break;
 
        /* mandatory */
        case OID_GEN_MAXIMUM_TOTAL_SIZE:
-               debug("%s: OID_GEN_MAXIMUM_TOTAL_SIZE\n", __func__);
+               DBG("%s: OID_GEN_MAXIMUM_TOTAL_SIZE\n", __func__);
                *outbuf = __constant_cpu_to_le32(RNDIS_MAX_TOTAL_SIZE);
                retval = 0;
                break;
 
        /* mandatory */
        case OID_GEN_MEDIA_CONNECT_STATUS:
-#if defined(DEBUG) && defined(DEBUG_VERBOSE)
-               debug("%s: OID_GEN_MEDIA_CONNECT_STATUS\n", __func__);
-#endif
-               *outbuf = cpu_to_le32(params->media_state);
+               if (rndis_debug > 1)
+                       DBG("%s: OID_GEN_MEDIA_CONNECT_STATUS\n", __func__);
+               *outbuf = cpu_to_le32 (rndis_per_dev_params [configNr]
+                                               .media_state);
                retval = 0;
                break;
 
        case OID_GEN_PHYSICAL_MEDIUM:
-               debug("%s: OID_GEN_PHYSICAL_MEDIUM\n", __func__);
-               *outbuf = __constant_cpu_to_le32(0);
+               DBG("%s: OID_GEN_PHYSICAL_MEDIUM\n", __func__);
+               *outbuf = __constant_cpu_to_le32 (0);
                retval = 0;
                break;
 
-       /*
-        * The RNDIS specification is incomplete/wrong.   Some versions
+       /* The RNDIS specification is incomplete/wrong.   Some versions
         * of MS-Windows expect OIDs that aren't specified there.  Other
         * versions emit undefined RNDIS messages. DOCUMENT ALL THESE!
         */
        case OID_GEN_MAC_OPTIONS:               /* from WinME */
-               debug("%s: OID_GEN_MAC_OPTIONS\n", __func__);
+               DBG("%s: OID_GEN_MAC_OPTIONS\n", __func__);
                *outbuf = __constant_cpu_to_le32(
-                                 NDIS_MAC_OPTION_RECEIVE_SERIALIZED
-                               | NDIS_MAC_OPTION_FULL_DUPLEX);
+                         NDIS_MAC_OPTION_RECEIVE_SERIALIZED
+                       | NDIS_MAC_OPTION_FULL_DUPLEX);
                retval = 0;
                break;
 
@@ -337,181 +358,195 @@ static int gen_ndis_query_resp(int configNr, u32 OID, u8 *buf,
 
        /* mandatory */
        case OID_GEN_XMIT_OK:
-#if defined(DEBUG) && defined(DEBUG_VERBOSE)
-               debug("%s: OID_GEN_XMIT_OK\n", __func__);
-#endif
-               if (params->stats) {
-                       *outbuf = cpu_to_le32(
-                                       params->stats->tx_packets -
-                                       params->stats->tx_errors -
-                                       params->stats->tx_dropped);
+               if (rndis_debug > 1)
+                       DBG("%s: OID_GEN_XMIT_OK\n", __func__);
+               if (rndis_per_dev_params [configNr].stats) {
+                       *outbuf = cpu_to_le32 (
+                           rndis_per_dev_params [configNr].stats->tx_packets -
+                           rndis_per_dev_params [configNr].stats->tx_errors -
+                           rndis_per_dev_params [configNr].stats->tx_dropped);
                        retval = 0;
                }
                break;
 
        /* mandatory */
        case OID_GEN_RCV_OK:
-#if defined(DEBUG) && defined(DEBUG_VERBOSE)
-               debug("%s: OID_GEN_RCV_OK\n", __func__);
-#endif
-               if (params->stats) {
-                       *outbuf = cpu_to_le32(
-                                       params->stats->rx_packets -
-                                       params->stats->rx_errors -
-                                       params->stats->rx_dropped);
+               if (rndis_debug > 1)
+                       DBG("%s: OID_GEN_RCV_OK\n", __func__);
+               if (rndis_per_dev_params [configNr].stats) {
+                       *outbuf = cpu_to_le32 (
+                           rndis_per_dev_params [configNr].stats->rx_packets -
+                           rndis_per_dev_params [configNr].stats->rx_errors -
+                           rndis_per_dev_params [configNr].stats->rx_dropped);
                        retval = 0;
                }
                break;
 
        /* mandatory */
        case OID_GEN_XMIT_ERROR:
-#if defined(DEBUG) && defined(DEBUG_VERBOSE)
-               debug("%s: OID_GEN_XMIT_ERROR\n", __func__);
-#endif
-               if (params->stats) {
-                       *outbuf = cpu_to_le32(params->stats->tx_errors);
+               if (rndis_debug > 1)
+                       DBG("%s: OID_GEN_XMIT_ERROR\n", __func__);
+               if (rndis_per_dev_params [configNr].stats) {
+                       *outbuf = cpu_to_le32 (rndis_per_dev_params [configNr]
+                                       .stats->tx_errors);
                        retval = 0;
                }
                break;
 
        /* mandatory */
        case OID_GEN_RCV_ERROR:
-#if defined(DEBUG) && defined(DEBUG_VERBOSE)
-               debug("%s: OID_GEN_RCV_ERROR\n", __func__);
-#endif
-               if (params->stats) {
-                       *outbuf = cpu_to_le32(params->stats->rx_errors);
+               if (rndis_debug > 1)
+                       DBG("%s: OID_GEN_RCV_ERROR\n", __func__);
+               if (rndis_per_dev_params [configNr].stats) {
+                       *outbuf = cpu_to_le32 (rndis_per_dev_params [configNr]
+                                       .stats->rx_errors);
                        retval = 0;
                }
                break;
 
        /* mandatory */
        case OID_GEN_RCV_NO_BUFFER:
-               debug("%s: OID_GEN_RCV_NO_BUFFER\n", __func__);
-               if (params->stats) {
-                       *outbuf = cpu_to_le32(params->stats->rx_dropped);
+               DBG("%s: OID_GEN_RCV_NO_BUFFER\n", __func__);
+               if (rndis_per_dev_params [configNr].stats) {
+                       *outbuf = cpu_to_le32 (rndis_per_dev_params [configNr]
+                                       .stats->rx_dropped);
                        retval = 0;
                }
                break;
 
 #ifdef RNDIS_OPTIONAL_STATS
        case OID_GEN_DIRECTED_BYTES_XMIT:
-               debug("%s: OID_GEN_DIRECTED_BYTES_XMIT\n", __func__);
+               DBG("%s: OID_GEN_DIRECTED_BYTES_XMIT\n", __func__);
                /*
                 * Aunt Tilly's size of shoes
                 * minus antarctica count of penguins
                 * divided by weight of Alpha Centauri
                 */
-               if (params->stats) {
-                       *outbuf = cpu_to_le32(
-                                       (params->stats->tx_packets -
-                                        params->stats->tx_errors -
-                                        params->stats->tx_dropped)
-                                       * 123);
+               if (rndis_per_dev_params [configNr].stats) {
+                       *outbuf = cpu_to_le32 (
+                               (rndis_per_dev_params [configNr]
+                                       .stats->tx_packets -
+                                rndis_per_dev_params [configNr]
+                                        .stats->tx_errors -
+                                rndis_per_dev_params [configNr]
+                                        .stats->tx_dropped)
+                               * 123);
                        retval = 0;
                }
                break;
 
        case OID_GEN_DIRECTED_FRAMES_XMIT:
-               debug("%s: OID_GEN_DIRECTED_FRAMES_XMIT\n", __func__);
+               DBG("%s: OID_GEN_DIRECTED_FRAMES_XMIT\n", __func__);
                /* dito */
-               if (params->stats) {
-                       *outbuf = cpu_to_le32(
-                                       (params->stats->tx_packets -
-                                        params->stats->tx_errors -
-                                        params->stats->tx_dropped)
-                                       / 123);
+               if (rndis_per_dev_params [configNr].stats) {
+                       *outbuf = cpu_to_le32 (
+                               (rndis_per_dev_params [configNr]
+                                       .stats->tx_packets -
+                                rndis_per_dev_params [configNr]
+                                        .stats->tx_errors -
+                                rndis_per_dev_params [configNr]
+                                        .stats->tx_dropped)
+                               / 123);
                        retval = 0;
                }
                break;
 
        case OID_GEN_MULTICAST_BYTES_XMIT:
-               debug("%s: OID_GEN_MULTICAST_BYTES_XMIT\n", __func__);
-               if (params->stats) {
-                       *outbuf = cpu_to_le32(params->stats->multicast * 1234);
+               DBG("%s: OID_GEN_MULTICAST_BYTES_XMIT\n", __func__);
+               if (rndis_per_dev_params [configNr].stats) {
+                       *outbuf = cpu_to_le32 (rndis_per_dev_params [configNr]
+                                       .stats->multicast*1234);
                        retval = 0;
                }
                break;
 
        case OID_GEN_MULTICAST_FRAMES_XMIT:
-               debug("%s: OID_GEN_MULTICAST_FRAMES_XMIT\n", __func__);
-               if (params->stats) {
-                       *outbuf = cpu_to_le32(params->stats->multicast);
+               DBG("%s: OID_GEN_MULTICAST_FRAMES_XMIT\n", __func__);
+               if (rndis_per_dev_params [configNr].stats) {
+                       *outbuf = cpu_to_le32 (rndis_per_dev_params [configNr]
+                                       .stats->multicast);
                        retval = 0;
                }
                break;
 
        case OID_GEN_BROADCAST_BYTES_XMIT:
-               debug("%s: OID_GEN_BROADCAST_BYTES_XMIT\n", __func__);
-               if (params->stats) {
-                       *outbuf = cpu_to_le32(params->stats->tx_packets/42*255);
+               DBG("%s: OID_GEN_BROADCAST_BYTES_XMIT\n", __func__);
+               if (rndis_per_dev_params [configNr].stats) {
+                       *outbuf = cpu_to_le32 (rndis_per_dev_params [configNr]
+                                       .stats->tx_packets/42*255);
                        retval = 0;
                }
                break;
 
        case OID_GEN_BROADCAST_FRAMES_XMIT:
-               debug("%s: OID_GEN_BROADCAST_FRAMES_XMIT\n", __func__);
-               if (params->stats) {
-                       *outbuf = cpu_to_le32(params->stats->tx_packets / 42);
+               DBG("%s: OID_GEN_BROADCAST_FRAMES_XMIT\n", __func__);
+               if (rndis_per_dev_params [configNr].stats) {
+                       *outbuf = cpu_to_le32 (rndis_per_dev_params [configNr]
+                                       .stats->tx_packets/42);
                        retval = 0;
                }
                break;
 
        case OID_GEN_DIRECTED_BYTES_RCV:
-               debug("%s: OID_GEN_DIRECTED_BYTES_RCV\n", __func__);
-               *outbuf = __constant_cpu_to_le32(0);
+               DBG("%s: OID_GEN_DIRECTED_BYTES_RCV\n", __func__);
+               *outbuf = __constant_cpu_to_le32 (0);
                retval = 0;
                break;
 
        case OID_GEN_DIRECTED_FRAMES_RCV:
-               debug("%s: OID_GEN_DIRECTED_FRAMES_RCV\n", __func__);
-               *outbuf = __constant_cpu_to_le32(0);
+               DBG("%s: OID_GEN_DIRECTED_FRAMES_RCV\n", __func__);
+               *outbuf = __constant_cpu_to_le32 (0);
                retval = 0;
                break;
 
        case OID_GEN_MULTICAST_BYTES_RCV:
-               debug("%s: OID_GEN_MULTICAST_BYTES_RCV\n", __func__);
-               if (params->stats) {
-                       *outbuf = cpu_to_le32(params->stats->multicast * 1111);
+               DBG("%s: OID_GEN_MULTICAST_BYTES_RCV\n", __func__);
+               if (rndis_per_dev_params [configNr].stats) {
+                       *outbuf = cpu_to_le32 (rndis_per_dev_params [configNr]
+                                       .stats->multicast * 1111);
                        retval = 0;
                }
                break;
 
        case OID_GEN_MULTICAST_FRAMES_RCV:
-               debug("%s: OID_GEN_MULTICAST_FRAMES_RCV\n", __func__);
-               if (params->stats) {
-                       *outbuf = cpu_to_le32(params->stats->multicast);
+               DBG("%s: OID_GEN_MULTICAST_FRAMES_RCV\n", __func__);
+               if (rndis_per_dev_params [configNr].stats) {
+                       *outbuf = cpu_to_le32 (rndis_per_dev_params [configNr]
+                                       .stats->multicast);
                        retval = 0;
                }
                break;
 
        case OID_GEN_BROADCAST_BYTES_RCV:
-               debug("%s: OID_GEN_BROADCAST_BYTES_RCV\n", __func__);
-               if (params->stats) {
-                       *outbuf = cpu_to_le32(params->stats->rx_packets/42*255);
+               DBG("%s: OID_GEN_BROADCAST_BYTES_RCV\n", __func__);
+               if (rndis_per_dev_params [configNr].stats) {
+                       *outbuf = cpu_to_le32 (rndis_per_dev_params [configNr]
+                                       .stats->rx_packets/42*255);
                        retval = 0;
                }
                break;
 
        case OID_GEN_BROADCAST_FRAMES_RCV:
-               debug("%s: OID_GEN_BROADCAST_FRAMES_RCV\n", __func__);
-               if (params->stats) {
-                       *outbuf = cpu_to_le32(params->stats->rx_packets / 42);
+               DBG("%s: OID_GEN_BROADCAST_FRAMES_RCV\n", __func__);
+               if (rndis_per_dev_params [configNr].stats) {
+                       *outbuf = cpu_to_le32 (rndis_per_dev_params [configNr]
+                                       .stats->rx_packets/42);
                        retval = 0;
                }
                break;
 
        case OID_GEN_RCV_CRC_ERROR:
-               debug("%s: OID_GEN_RCV_CRC_ERROR\n", __func__);
-               if (params->stats) {
-                       *outbuf = cpu_to_le32(params->stats->rx_crc_errors);
+               DBG("%s: OID_GEN_RCV_CRC_ERROR\n", __func__);
+               if (rndis_per_dev_params [configNr].stats) {
+                       *outbuf = cpu_to_le32 (rndis_per_dev_params [configNr]
+                                       .stats->rx_crc_errors);
                        retval = 0;
                }
                break;
 
        case OID_GEN_TRANSMIT_QUEUE_LENGTH:
-               debug("%s: OID_GEN_TRANSMIT_QUEUE_LENGTH\n", __func__);
-               *outbuf = __constant_cpu_to_le32(0);
+               DBG("%s: OID_GEN_TRANSMIT_QUEUE_LENGTH\n", __func__);
+               *outbuf = __constant_cpu_to_le32 (0);
                retval = 0;
                break;
 #endif /* RNDIS_OPTIONAL_STATS */
@@ -520,102 +555,107 @@ static int gen_ndis_query_resp(int configNr, u32 OID, u8 *buf,
 
        /* mandatory */
        case OID_802_3_PERMANENT_ADDRESS:
-               debug("%s: OID_802_3_PERMANENT_ADDRESS\n", __func__);
-               if (params->dev) {
+               DBG("%s: OID_802_3_PERMANENT_ADDRESS\n", __func__);
+               if (rndis_per_dev_params [configNr].dev) {
                        length = ETH_ALEN;
-                       memcpy(outbuf, params->host_mac, length);
+                       memcpy (outbuf,
+                               rndis_per_dev_params [configNr].host_mac,
+                               length);
                        retval = 0;
                }
                break;
 
        /* mandatory */
        case OID_802_3_CURRENT_ADDRESS:
-               debug("%s: OID_802_3_CURRENT_ADDRESS\n", __func__);
-               if (params->dev) {
+               DBG("%s: OID_802_3_CURRENT_ADDRESS\n", __func__);
+               if (rndis_per_dev_params [configNr].dev) {
                        length = ETH_ALEN;
-                       memcpy(outbuf, params->host_mac, length);
+                       memcpy (outbuf,
+                               rndis_per_dev_params [configNr].host_mac,
+                               length);
                        retval = 0;
                }
                break;
 
        /* mandatory */
        case OID_802_3_MULTICAST_LIST:
-               debug("%s: OID_802_3_MULTICAST_LIST\n", __func__);
+               DBG("%s: OID_802_3_MULTICAST_LIST\n", __func__);
                /* Multicast base address only */
-               *outbuf = __constant_cpu_to_le32(0xE0000000);
+               *outbuf = __constant_cpu_to_le32 (0xE0000000);
                retval = 0;
                break;
 
        /* mandatory */
        case OID_802_3_MAXIMUM_LIST_SIZE:
-               debug("%s: OID_802_3_MAXIMUM_LIST_SIZE\n", __func__);
+               DBG("%s: OID_802_3_MAXIMUM_LIST_SIZE\n", __func__);
                /* Multicast base address only */
-               *outbuf = __constant_cpu_to_le32(1);
+               *outbuf = __constant_cpu_to_le32 (1);
                retval = 0;
                break;
 
        case OID_802_3_MAC_OPTIONS:
-               debug("%s: OID_802_3_MAC_OPTIONS\n", __func__);
+               DBG("%s: OID_802_3_MAC_OPTIONS\n", __func__);
                break;
 
        /* ieee802.3 statistics OIDs (table 4-4) */
 
        /* mandatory */
        case OID_802_3_RCV_ERROR_ALIGNMENT:
-               debug("%s: OID_802_3_RCV_ERROR_ALIGNMENT\n", __func__);
-               if (params->stats) {
-                       *outbuf = cpu_to_le32(params->stats->rx_frame_errors);
+               DBG("%s: OID_802_3_RCV_ERROR_ALIGNMENT\n", __func__);
+               if (rndis_per_dev_params [configNr].stats) {
+                       *outbuf = cpu_to_le32 (rndis_per_dev_params [configNr]
+                                       .stats->rx_frame_errors);
                        retval = 0;
                }
                break;
 
        /* mandatory */
        case OID_802_3_XMIT_ONE_COLLISION:
-               debug("%s: OID_802_3_XMIT_ONE_COLLISION\n", __func__);
-               *outbuf = __constant_cpu_to_le32(0);
+               DBG("%s: OID_802_3_XMIT_ONE_COLLISION\n", __func__);
+               *outbuf = __constant_cpu_to_le32 (0);
                retval = 0;
                break;
 
        /* mandatory */
        case OID_802_3_XMIT_MORE_COLLISIONS:
-               debug("%s: OID_802_3_XMIT_MORE_COLLISIONS\n", __func__);
-               *outbuf = __constant_cpu_to_le32(0);
+               DBG("%s: OID_802_3_XMIT_MORE_COLLISIONS\n", __func__);
+               *outbuf = __constant_cpu_to_le32 (0);
                retval = 0;
                break;
 
 #ifdef RNDIS_OPTIONAL_STATS
        case OID_802_3_XMIT_DEFERRED:
-               debug("%s: OID_802_3_XMIT_DEFERRED\n", __func__);
+               DBG("%s: OID_802_3_XMIT_DEFERRED\n", __func__);
                /* TODO */
                break;
 
        case OID_802_3_XMIT_MAX_COLLISIONS:
-               debug("%s: OID_802_3_XMIT_MAX_COLLISIONS\n", __func__);
+               DBG("%s: OID_802_3_XMIT_MAX_COLLISIONS\n", __func__);
                /* TODO */
                break;
 
        case OID_802_3_RCV_OVERRUN:
-               debug("%s: OID_802_3_RCV_OVERRUN\n", __func__);
+               DBG("%s: OID_802_3_RCV_OVERRUN\n", __func__);
                /* TODO */
                break;
 
        case OID_802_3_XMIT_UNDERRUN:
-               debug("%s: OID_802_3_XMIT_UNDERRUN\n", __func__);
+               DBG("%s: OID_802_3_XMIT_UNDERRUN\n", __func__);
                /* TODO */
                break;
 
        case OID_802_3_XMIT_HEARTBEAT_FAILURE:
-               debug("%s: OID_802_3_XMIT_HEARTBEAT_FAILURE\n", __func__);
+               DBG("%s: OID_802_3_XMIT_HEARTBEAT_FAILURE\n", __func__);
                /* TODO */
                break;
 
        case OID_802_3_XMIT_TIMES_CRS_LOST:
-               debug("%s: OID_802_3_XMIT_TIMES_CRS_LOST\n", __func__);
+               DBG("%s: OID_802_3_XMIT_TIMES_CRS_LOST\n", __func__);
                /* TODO */
                break;
 
        case OID_802_3_XMIT_LATE_COLLISIONS:
-               debug("%s: OID_802_3_XMIT_LATE_COLLISIONS\n", __func__);
+               DBG("%s: OID_802_3_XMIT_LATE_COLLISIONS\n", __func__);
                /* TODO */
                break;
 #endif /* RNDIS_OPTIONAL_STATS */
@@ -623,18 +663,17 @@ static int gen_ndis_query_resp(int configNr, u32 OID, u8 *buf,
 #ifdef RNDIS_PM
        /* power management OIDs (table 4-5) */
        case OID_PNP_CAPABILITIES:
-               debug("%s: OID_PNP_CAPABILITIES\n", __func__);
+               DBG("%s: OID_PNP_CAPABILITIES\n", __func__);
 
                /* for now, no wakeup capabilities */
-               length = sizeof(struct NDIS_PNP_CAPABILITIES);
+               length = sizeof (struct NDIS_PNP_CAPABILITIES);
                memset(outbuf, 0, length);
                retval = 0;
                break;
        case OID_PNP_QUERY_POWER:
-               debug("%s: OID_PNP_QUERY_POWER D%d\n", __func__,
+               DBG("%s: OID_PNP_QUERY_POWER D%d\n", __func__,
                                get_unaligned_le32(buf) - 1);
-               /*
-                * only suspend is a real power state, and
+               /* only suspend is a real power state, and
                 * it can't be entered by OID_PNP_SET_POWER...
                 */
                length = 0;
@@ -643,26 +682,23 @@ static int gen_ndis_query_resp(int configNr, u32 OID, u8 *buf,
 #endif
 
        default:
-               debug("%s: query unknown OID 0x%08X\n", __func__, OID);
+               printf("%s: query unknown OID 0x%08X\n", __func__, OID);
        }
        if (retval < 0)
                length = 0;
 
-       resp->InformationBufferLength = cpu_to_le32(length);
+       resp->InformationBufferLength = cpu_to_le32 (length);
        r->length = length + sizeof *resp;
-       resp->MessageLength = cpu_to_le32(r->length);
+       resp->MessageLength = cpu_to_le32 (r->length);
        return retval;
 }
 
-static int gen_ndis_set_resp(u8 configNr, u32 OID, u8 *buf, u32 buf_len,
-                               rndis_resp_t *r)
+static int gen_ndis_set_resp (u8 configNr, u32 OID, u8 *buf, u32 buf_len,
+                       rndis_resp_t *r)
 {
        rndis_set_cmplt_type            *resp;
-       int                             retval = -ENOTSUPP;
+       int                             i, retval = -ENOTSUPP;
        struct rndis_params             *params;
-#if (defined(DEBUG) && defined(DEBUG_VERBOSE)) || defined(RNDIS_PM)
-       int                             i;
-#endif
 
        if (!r)
                return -ENOMEM;
@@ -670,36 +706,32 @@ static int gen_ndis_set_resp(u8 configNr, u32 OID, u8 *buf, u32 buf_len,
        if (!resp)
                return -ENOMEM;
 
-#if defined(DEBUG) && defined(DEBUG_VERBOSE)
-       if (buf_len) {
-               debug("set OID %08x value, len %d:\n", OID, buf_len);
+       if (buf_len && rndis_debug > 1) {
+               DBG("set OID %08x value, len %d:\n", OID, buf_len);
                for (i = 0; i < buf_len; i += 16) {
-                       debug("%03d: %08x %08x %08x %08x\n", i,
+                       DBG("%03d: %08x %08x %08x %08x\n", i,
                                get_unaligned_le32(&buf[i]),
                                get_unaligned_le32(&buf[i + 4]),
                                get_unaligned_le32(&buf[i + 8]),
                                get_unaligned_le32(&buf[i + 12]));
                }
        }
-#endif
 
-       params = &rndis_per_dev_params[configNr];
+       params = &rndis_per_dev_params [configNr];
        switch (OID) {
        case OID_GEN_CURRENT_PACKET_FILTER:
 
-               /*
-                * these NDIS_PACKET_TYPE_* bitflags are shared with
+               /* these NDIS_PACKET_TYPE_* bitflags are shared with
                 * cdc_filter; it's not RNDIS-specific
                 * NDIS_PACKET_TYPE_x == USB_CDC_PACKET_TYPE_x for x in:
                 *      PROMISCUOUS, DIRECTED,
                 *      MULTICAST, ALL_MULTICAST, BROADCAST
                 */
-               *params->filter = (u16) get_unaligned_le32(buf);
-               debug("%s: OID_GEN_CURRENT_PACKET_FILTER %08x\n",
+               *params->filter = (u16)get_unaligned_le32(buf);
+               DBG("%s: OID_GEN_CURRENT_PACKET_FILTER %08x\n",
                        __func__, *params->filter);
 
-               /*
-                * this call has a significant side effect:  it's
+               /* this call has a significant side effect:  it's
                 * what makes the packet flow start and stop, like
                 * activating the CDC Ethernet altsetting.
                 */
@@ -707,15 +739,21 @@ static int gen_ndis_set_resp(u8 configNr, u32 OID, u8 *buf, u32 buf_len,
 update_linkstate:
 #endif
                retval = 0;
-               if (*params->filter)
+               if (*params->filter) {
                        params->state = RNDIS_DATA_INITIALIZED;
-               else
+                       netif_carrier_on(params->dev);
+                       if (netif_running(params->dev))
+                               netif_wake_queue (params->dev);
+               } else {
                        params->state = RNDIS_INITIALIZED;
+                       netif_carrier_off (params->dev);
+                       netif_stop_queue (params->dev);
+               }
                break;
 
        case OID_802_3_MULTICAST_LIST:
                /* I think we can ignore this */
-               debug("%s: OID_802_3_MULTICAST_LIST\n", __func__);
+               DBG("%s: OID_802_3_MULTICAST_LIST\n", __func__);
                retval = 0;
                break;
 #if 0
@@ -723,9 +761,9 @@ update_linkstate:
                {
                struct rndis_config_parameter   *param;
                param = (struct rndis_config_parameter *) buf;
-               debug("%s: OID_GEN_RNDIS_CONFIG_PARAMETER '%*s'\n",
+               DBG("%s: OID_GEN_RNDIS_CONFIG_PARAMETER '%*s'\n",
                        __func__,
-                       min(cpu_to_le32(param->ParameterNameLength), 80),
+                       min(cpu_to_le32(param->ParameterNameLength),80),
                        buf + param->ParameterNameOffset);
                retval = 0;
                }
@@ -734,14 +772,13 @@ update_linkstate:
 
 #ifdef RNDIS_PM
        case OID_PNP_SET_POWER:
-               /*
-                * The only real power state is USB suspend, and RNDIS requests
+               /* The only real power state is USB suspend, and RNDIS requests
                 * can't enter it; this one isn't really about power.  After
                 * resuming, Windows forces a reset, and then SET_POWER D0.
                 * FIXME ... then things go batty; Windows wedges itself.
                 */
                i = get_unaligned_le32(buf);
-               debug("%s: OID_PNP_SET_POWER D%d\n", __func__, i - 1);
+               DBG("%s: OID_PNP_SET_POWER D%d\n", __func__, i - 1);
                switch (i) {
                case NdisDeviceStateD0:
                        *params->filter = params->saved_filter;
@@ -756,18 +793,16 @@ update_linkstate:
                break;
 
 #ifdef RNDIS_WAKEUP
-       /*
-        * no wakeup support advertised, so wakeup OIDs always fail:
-        *  - OID_PNP_ENABLE_WAKE_UP
-        *  - OID_PNP_{ADD,REMOVE}_WAKE_UP_PATTERN
-        */
+       // no wakeup support advertised, so wakeup OIDs always fail:
+       //  - OID_PNP_ENABLE_WAKE_UP
+       //  - OID_PNP_{ADD,REMOVE}_WAKE_UP_PATTERN
 #endif
 
 #endif /* RNDIS_PM */
 
        default:
-               debug("%s: set unknown OID 0x%08X, size %d\n",
-                       __func__, OID, buf_len);
+               printf("%s: set unknown OID 0x%08X, size %d\n",
+                        __func__, OID, buf_len);
        }
 
        return retval;
@@ -777,53 +812,50 @@ update_linkstate:
  * Response Functions
  */
 
-static int rndis_init_response(int configNr, rndis_init_msg_type *buf)
+static int rndis_init_response (int configNr, rndis_init_msg_type *buf)
 {
        rndis_init_cmplt_type   *resp;
        rndis_resp_t            *r;
 
-       if (!rndis_per_dev_params[configNr].dev)
-               return -ENOTSUPP;
+       if (!rndis_per_dev_params [configNr].dev) return -ENOTSUPP;
 
-       r = rndis_add_response(configNr, sizeof(rndis_init_cmplt_type));
+       r = rndis_add_response (configNr, sizeof (rndis_init_cmplt_type));
        if (!r)
                return -ENOMEM;
        resp = (rndis_init_cmplt_type *) r->buf;
 
-       resp->MessageType = __constant_cpu_to_le32(
-                       REMOTE_NDIS_INITIALIZE_CMPLT);
-       resp->MessageLength = __constant_cpu_to_le32(52);
-       resp->RequestID = get_unaligned(&buf->RequestID); /* Still LE in msg buffer */
-       resp->Status = __constant_cpu_to_le32(RNDIS_STATUS_SUCCESS);
-       resp->MajorVersion = __constant_cpu_to_le32(RNDIS_MAJOR_VERSION);
-       resp->MinorVersion = __constant_cpu_to_le32(RNDIS_MINOR_VERSION);
-       resp->DeviceFlags = __constant_cpu_to_le32(RNDIS_DF_CONNECTIONLESS);
-       resp->Medium = __constant_cpu_to_le32(RNDIS_MEDIUM_802_3);
-       resp->MaxPacketsPerTransfer = __constant_cpu_to_le32(1);
-       resp->MaxTransferSize = cpu_to_le32(
-                 rndis_per_dev_params[configNr].mtu
+       resp->MessageType = __constant_cpu_to_le32 (REMOTE_NDIS_INITIALIZE_CMPLT);
+       resp->MessageLength = __constant_cpu_to_le32 (52);
+       resp->RequestID = get_unaligned_le32(&buf->RequestID); /* Still LE in msg buffer */
+       resp->Status = __constant_cpu_to_le32 (RNDIS_STATUS_SUCCESS);
+       resp->MajorVersion = __constant_cpu_to_le32 (RNDIS_MAJOR_VERSION);
+       resp->MinorVersion = __constant_cpu_to_le32 (RNDIS_MINOR_VERSION);
+       resp->DeviceFlags = __constant_cpu_to_le32 (RNDIS_DF_CONNECTIONLESS);
+       resp->Medium = __constant_cpu_to_le32 (RNDIS_MEDIUM_802_3);
+       resp->MaxPacketsPerTransfer = __constant_cpu_to_le32 (1);
+       resp->MaxTransferSize = cpu_to_le32 (
+                 rndis_per_dev_params [configNr].dev->mtu
                + ETHER_HDR_SIZE
-               + sizeof(struct rndis_packet_msg_type)
+               + sizeof (struct rndis_packet_msg_type)
                + 22);
-       resp->PacketAlignmentFactor = __constant_cpu_to_le32(0);
-       resp->AFListOffset = __constant_cpu_to_le32(0);
-       resp->AFListSize = __constant_cpu_to_le32(0);
+       resp->PacketAlignmentFactor = __constant_cpu_to_le32 (0);
+       resp->AFListOffset = __constant_cpu_to_le32 (0);
+       resp->AFListSize = __constant_cpu_to_le32 (0);
 
-       if (rndis_per_dev_params[configNr].ack)
-               rndis_per_dev_params[configNr].ack(
-                       rndis_per_dev_params[configNr].dev);
+       if (rndis_per_dev_params [configNr].ack)
+               rndis_per_dev_params [configNr].ack (
+                       rndis_per_dev_params [configNr].dev);
 
        return 0;
 }
 
-static int rndis_query_response(int configNr, rndis_query_msg_type *buf)
+static int rndis_query_response (int configNr, rndis_query_msg_type *buf)
 {
        rndis_query_cmplt_type *resp;
        rndis_resp_t            *r;
 
-       debug("%s: OID = %08X\n", __func__, get_unaligned_le32(&buf->OID));
-       if (!rndis_per_dev_params[configNr].dev)
-               return -ENOTSUPP;
+       // DBG("%s: OID = %08X\n", __func__, get_unaligned_le32(&buf->OID));
+       if (!rndis_per_dev_params [configNr].dev) return -ENOTSUPP;
 
        /*
         * we need more memory:
@@ -831,42 +863,45 @@ static int rndis_query_response(int configNr, rndis_query_msg_type *buf)
         * rndis_query_cmplt_type followed by data.
         * oid_supported_list is the largest data reply
         */
-       r = rndis_add_response(configNr,
-               sizeof(oid_supported_list) + sizeof(rndis_query_cmplt_type));
+       r = rndis_add_response (configNr,
+               sizeof (oid_supported_list) + sizeof(rndis_query_cmplt_type));
        if (!r)
                return -ENOMEM;
        resp = (rndis_query_cmplt_type *) r->buf;
 
-       resp->MessageType = __constant_cpu_to_le32(REMOTE_NDIS_QUERY_CMPLT);
-       resp->RequestID = get_unaligned(&buf->RequestID); /* Still LE in msg buffer */
+       resp->MessageType = __constant_cpu_to_le32 (REMOTE_NDIS_QUERY_CMPLT);
+       resp->RequestID = get_unaligned_le32(&buf->RequestID); /* Still LE in msg buffer */
 
-       if (gen_ndis_query_resp(configNr, get_unaligned_le32(&buf->OID),
+       if (gen_ndis_query_resp (configNr, get_unaligned_le32(&buf->OID),
                        get_unaligned_le32(&buf->InformationBufferOffset)
                                        + 8 + (u8 *) buf,
                        get_unaligned_le32(&buf->InformationBufferLength),
                        r)) {
                /* OID not supported */
-               resp->Status = __constant_cpu_to_le32(
-                                               RNDIS_STATUS_NOT_SUPPORTED);
-               resp->MessageLength = __constant_cpu_to_le32(sizeof *resp);
-               resp->InformationBufferLength = __constant_cpu_to_le32(0);
-               resp->InformationBufferOffset = __constant_cpu_to_le32(0);
+               resp->Status = __constant_cpu_to_le32 (
+                               RNDIS_STATUS_NOT_SUPPORTED);
+               resp->MessageLength = __constant_cpu_to_le32 (sizeof *resp);
+               resp->InformationBufferLength = __constant_cpu_to_le32 (0);
+               resp->InformationBufferOffset = __constant_cpu_to_le32 (0);
        } else
-               resp->Status = __constant_cpu_to_le32(RNDIS_STATUS_SUCCESS);
+               resp->Status = __constant_cpu_to_le32 (RNDIS_STATUS_SUCCESS);
 
-       if (rndis_per_dev_params[configNr].ack)
-               rndis_per_dev_params[configNr].ack(
-                       rndis_per_dev_params[configNr].dev);
+       if (rndis_per_dev_params [configNr].ack)
+               rndis_per_dev_params [configNr].ack (
+                       rndis_per_dev_params [configNr].dev);
        return 0;
 }
 
-static int rndis_set_response(int configNr, rndis_set_msg_type *buf)
+static int rndis_set_response (int configNr, rndis_set_msg_type *buf)
 {
        u32                     BufLength, BufOffset;
        rndis_set_cmplt_type    *resp;
        rndis_resp_t            *r;
+#ifdef VERBOSE
+       int i;
+#endif
 
-       r = rndis_add_response(configNr, sizeof(rndis_set_cmplt_type));
+       r = rndis_add_response (configNr, sizeof (rndis_set_cmplt_type));
        if (!r)
                return -ENOMEM;
        resp = (rndis_set_cmplt_type *) r->buf;
@@ -875,78 +910,78 @@ static int rndis_set_response(int configNr, rndis_set_msg_type *buf)
        BufOffset = get_unaligned_le32(&buf->InformationBufferOffset);
 
 #ifdef VERBOSE
-       debug("%s: Length: %d\n", __func__, BufLength);
-       debug("%s: Offset: %d\n", __func__, BufOffset);
-       debug("%s: InfoBuffer: ", __func__);
+       DBG("%s: Length: %d\n", __func__, BufLength);
+       DBG("%s: Offset: %d\n", __func__, BufOffset);
+       DBG("%s: InfoBuffer: ", __func__);
 
-       for (i = 0; i < BufLength; i++)
-               debug("%02x ", *(((u8 *) buf) + i + 8 + BufOffset));
+       for (i = 0; i < BufLength; i++) {
+               DBG("%02x ", *(((u8 *) buf) + i + 8 + BufOffset));
+       }
 
-       debug("\n");
+       DBG("\n");
 #endif
 
-       resp->MessageType = __constant_cpu_to_le32(REMOTE_NDIS_SET_CMPLT);
-       resp->MessageLength = __constant_cpu_to_le32(16);
-       resp->RequestID = get_unaligned(&buf->RequestID); /* Still LE in msg buffer */
-       if (gen_ndis_set_resp(configNr, get_unaligned_le32(&buf->OID),
+       resp->MessageType = __constant_cpu_to_le32 (REMOTE_NDIS_SET_CMPLT);
+       resp->MessageLength = __constant_cpu_to_le32 (16);
+       resp->RequestID = get_unaligned_le32(&buf->RequestID); /* Still LE in msg buffer */
+       if (gen_ndis_set_resp (configNr, get_unaligned_le32(&buf->OID),
                        ((u8 *) buf) + 8 + BufOffset, BufLength, r))
-               resp->Status = __constant_cpu_to_le32(
-                                               RNDIS_STATUS_NOT_SUPPORTED);
+               resp->Status = __constant_cpu_to_le32 (RNDIS_STATUS_NOT_SUPPORTED);
        else
-               resp->Status = __constant_cpu_to_le32(RNDIS_STATUS_SUCCESS);
+               resp->Status = __constant_cpu_to_le32 (RNDIS_STATUS_SUCCESS);
 
-       if (rndis_per_dev_params[configNr].ack)
-               rndis_per_dev_params[configNr].ack(
-                       rndis_per_dev_params[configNr].dev);
+       if (rndis_per_dev_params [configNr].ack)
+               rndis_per_dev_params [configNr].ack (
+                       rndis_per_dev_params [configNr].dev);
 
        return 0;
 }
 
-static int rndis_reset_response(int configNr, rndis_reset_msg_type *buf)
+static int rndis_reset_response (int configNr, rndis_reset_msg_type *buf)
 {
        rndis_reset_cmplt_type  *resp;
        rndis_resp_t            *r;
 
-       r = rndis_add_response(configNr, sizeof(rndis_reset_cmplt_type));
+       r = rndis_add_response (configNr, sizeof (rndis_reset_cmplt_type));
        if (!r)
                return -ENOMEM;
        resp = (rndis_reset_cmplt_type *) r->buf;
 
-       resp->MessageType = __constant_cpu_to_le32(REMOTE_NDIS_RESET_CMPLT);
-       resp->MessageLength = __constant_cpu_to_le32(16);
-       resp->Status = __constant_cpu_to_le32(RNDIS_STATUS_SUCCESS);
+       resp->MessageType = __constant_cpu_to_le32 (REMOTE_NDIS_RESET_CMPLT);
+       resp->MessageLength = __constant_cpu_to_le32 (16);
+       resp->Status = __constant_cpu_to_le32 (RNDIS_STATUS_SUCCESS);
        /* resent information */
-       resp->AddressingReset = __constant_cpu_to_le32(1);
+       resp->AddressingReset = __constant_cpu_to_le32 (1);
 
-       if (rndis_per_dev_params[configNr].ack)
-               rndis_per_dev_params[configNr].ack(
-                       rndis_per_dev_params[configNr].dev);
+       if (rndis_per_dev_params [configNr].ack)
+               rndis_per_dev_params [configNr].ack (
+                       rndis_per_dev_params [configNr].dev);
 
        return 0;
 }
 
-static int rndis_keepalive_response(int configNr,
-                                       rndis_keepalive_msg_type *buf)
+static int rndis_keepalive_response (int configNr,
+                               rndis_keepalive_msg_type *buf)
 {
        rndis_keepalive_cmplt_type      *resp;
        rndis_resp_t                    *r;
 
        /* host "should" check only in RNDIS_DATA_INITIALIZED state */
 
-       r = rndis_add_response(configNr, sizeof(rndis_keepalive_cmplt_type));
+       r = rndis_add_response (configNr, sizeof (rndis_keepalive_cmplt_type));
        if (!r)
                return -ENOMEM;
        resp = (rndis_keepalive_cmplt_type *) r->buf;
 
-       resp->MessageType = __constant_cpu_to_le32(
+       resp->MessageType = __constant_cpu_to_le32 (
                        REMOTE_NDIS_KEEPALIVE_CMPLT);
-       resp->MessageLength = __constant_cpu_to_le32(16);
-       resp->RequestID = get_unaligned(&buf->RequestID); /* Still LE in msg buffer */
-       resp->Status = __constant_cpu_to_le32(RNDIS_STATUS_SUCCESS);
+       resp->MessageLength = __constant_cpu_to_le32 (16);
+       resp->RequestID = get_unaligned_le32(&buf->RequestID); /* Still LE in msg buffer */
+       resp->Status = __constant_cpu_to_le32 (RNDIS_STATUS_SUCCESS);
 
-       if (rndis_per_dev_params[configNr].ack)
-               rndis_per_dev_params[configNr].ack(
-                       rndis_per_dev_params[configNr].dev);
+       if (rndis_per_dev_params [configNr].ack)
+               rndis_per_dev_params [configNr].ack (
+                       rndis_per_dev_params [configNr].dev);
 
        return 0;
 }
@@ -955,92 +990,78 @@ static int rndis_keepalive_response(int configNr,
 /*
  * Device to Host Comunication
  */
-static int rndis_indicate_status_msg(int configNr, u32 status)
+static int rndis_indicate_status_msg (int configNr, u32 status)
 {
        rndis_indicate_status_msg_type  *resp;
        rndis_resp_t                    *r;
 
-       if (rndis_per_dev_params[configNr].state == RNDIS_UNINITIALIZED)
+       if (rndis_per_dev_params [configNr].state == RNDIS_UNINITIALIZED)
                return -ENOTSUPP;
 
-       r = rndis_add_response(configNr,
-                               sizeof(rndis_indicate_status_msg_type));
+       r = rndis_add_response (configNr,
+                               sizeof (rndis_indicate_status_msg_type));
        if (!r)
                return -ENOMEM;
        resp = (rndis_indicate_status_msg_type *) r->buf;
 
-       resp->MessageType = __constant_cpu_to_le32(
+       resp->MessageType = __constant_cpu_to_le32 (
                        REMOTE_NDIS_INDICATE_STATUS_MSG);
-       resp->MessageLength = __constant_cpu_to_le32(20);
-       resp->Status = cpu_to_le32(status);
-       resp->StatusBufferLength = __constant_cpu_to_le32(0);
-       resp->StatusBufferOffset = __constant_cpu_to_le32(0);
-
-       if (rndis_per_dev_params[configNr].ack)
-               rndis_per_dev_params[configNr].ack(
-                       rndis_per_dev_params[configNr].dev);
+       resp->MessageLength = __constant_cpu_to_le32 (20);
+       resp->Status = cpu_to_le32 (status);
+       resp->StatusBufferLength = __constant_cpu_to_le32 (0);
+       resp->StatusBufferOffset = __constant_cpu_to_le32 (0);
+
+       if (rndis_per_dev_params [configNr].ack)
+               rndis_per_dev_params [configNr].ack (
+                       rndis_per_dev_params [configNr].dev);
        return 0;
 }
 
-int rndis_signal_connect(int configNr)
+int rndis_signal_connect (int configNr)
 {
-       rndis_per_dev_params[configNr].media_state
+       rndis_per_dev_params [configNr].media_state
                        = NDIS_MEDIA_STATE_CONNECTED;
-       return rndis_indicate_status_msg(configNr,
+       return rndis_indicate_status_msg (configNr,
                                          RNDIS_STATUS_MEDIA_CONNECT);
 }
 
-int rndis_signal_disconnect(int configNr)
+int rndis_signal_disconnect (int configNr)
 {
-       rndis_per_dev_params[configNr].media_state
+       rndis_per_dev_params [configNr].media_state
                        = NDIS_MEDIA_STATE_DISCONNECTED;
-
-#ifdef RNDIS_COMPLETE_SIGNAL_DISCONNECT
-       return rndis_indicate_status_msg(configNr,
+       return rndis_indicate_status_msg (configNr,
                                          RNDIS_STATUS_MEDIA_DISCONNECT);
-#else
-       return 0;
-#endif
 }
 
-void rndis_uninit(int configNr)
+void rndis_uninit (int configNr)
 {
        u8 *buf;
        u32 length;
 
        if (configNr >= RNDIS_MAX_CONFIGS)
                return;
-       rndis_per_dev_params[configNr].used = 0;
-       rndis_per_dev_params[configNr].state = RNDIS_UNINITIALIZED;
+       rndis_per_dev_params [configNr].used = 0;
+       rndis_per_dev_params [configNr].state = RNDIS_UNINITIALIZED;
 
        /* drain the response queue */
        while ((buf = rndis_get_next_response(configNr, &length)))
                rndis_free_response(configNr, buf);
 }
 
-void rndis_set_host_mac(int configNr, const u8 *addr)
+void rndis_set_host_mac (int configNr, const u8 *addr)
 {
-       rndis_per_dev_params[configNr].host_mac = addr;
-}
-
-enum rndis_state rndis_get_state(int configNr)
-{
-       if (configNr >= RNDIS_MAX_CONFIGS || configNr < 0)
-               return -ENOTSUPP;
-       return rndis_per_dev_params[configNr].state;
+       rndis_per_dev_params [configNr].host_mac = addr;
 }
 
 /*
  * Message Parser
  */
-int rndis_msg_parser(u8 configNr, u8 *buf)
+int rndis_msg_parser (u8 configNr, u8 *buf)
 {
-       u32                             MsgType, MsgLength;
-       __le32                          *tmp;
+       u32 MsgType, MsgLength;
+       __le32 *tmp;
        struct rndis_params             *params;
 
-       debug("%s: configNr = %d, %p\n", __func__, configNr, buf);
-
        if (!buf)
                return -ENOMEM;
 
@@ -1050,10 +1071,9 @@ int rndis_msg_parser(u8 configNr, u8 *buf)
 
        if (configNr >= RNDIS_MAX_CONFIGS)
                return -ENOTSUPP;
-       params = &rndis_per_dev_params[configNr];
+       params = &rndis_per_dev_params [configNr];
 
-       /*
-        * NOTE: RNDIS is *EXTREMELY* chatty ... Windows constantly polls for
+       /* NOTE: RNDIS is *EXTREMELY* chatty ... Windows constantly polls for
         * rx/tx statistics and link status, in addition to KEEPALIVE traffic
         * and normal HC level polling to see if there's any IN traffic.
         */
@@ -1061,62 +1081,69 @@ int rndis_msg_parser(u8 configNr, u8 *buf)
        /* For USB: responses may take up to 10 seconds */
        switch (MsgType) {
        case REMOTE_NDIS_INITIALIZE_MSG:
-               debug("%s: REMOTE_NDIS_INITIALIZE_MSG\n", __func__);
+               DBG("%s: REMOTE_NDIS_INITIALIZE_MSG\n",
+                       __func__ );
                params->state = RNDIS_INITIALIZED;
-               return  rndis_init_response(configNr,
+               return  rndis_init_response (configNr,
                                        (rndis_init_msg_type *) buf);
 
        case REMOTE_NDIS_HALT_MSG:
-               debug("%s: REMOTE_NDIS_HALT_MSG\n", __func__);
+               DBG("%s: REMOTE_NDIS_HALT_MSG\n",
+                       __func__ );
                params->state = RNDIS_UNINITIALIZED;
+               if (params->dev) {
+                       netif_carrier_off (params->dev);
+                       netif_stop_queue (params->dev);
+               }
                return 0;
 
        case REMOTE_NDIS_QUERY_MSG:
-               return rndis_query_response(configNr,
+               return rndis_query_response (configNr,
                                        (rndis_query_msg_type *) buf);
 
        case REMOTE_NDIS_SET_MSG:
-               return rndis_set_response(configNr,
+               return rndis_set_response (configNr,
                                        (rndis_set_msg_type *) buf);
 
        case REMOTE_NDIS_RESET_MSG:
-               debug("%s: REMOTE_NDIS_RESET_MSG\n", __func__);
-               return rndis_reset_response(configNr,
+               DBG("%s: REMOTE_NDIS_RESET_MSG\n",
+                       __func__ );
+               return rndis_reset_response (configNr,
                                        (rndis_reset_msg_type *) buf);
 
        case REMOTE_NDIS_KEEPALIVE_MSG:
                /* For USB: host does this every 5 seconds */
-#if defined(DEBUG) && defined(DEBUG_VERBOSE)
-               debug("%s: REMOTE_NDIS_KEEPALIVE_MSG\n", __func__);
-#endif
-               return rndis_keepalive_response(configNr,
-                                       (rndis_keepalive_msg_type *) buf);
+               if (rndis_debug > 1)
+                       DBG("%s: REMOTE_NDIS_KEEPALIVE_MSG\n",
+                               __func__ );
+               return rndis_keepalive_response (configNr,
+                                                (rndis_keepalive_msg_type *)
+                                                buf);
 
        default:
-               /*
-                * At least Windows XP emits some undefined RNDIS messages.
+               /* At least Windows XP emits some undefined RNDIS messages.
                 * In one case those messages seemed to relate to the host
                 * suspending itself.
                 */
-               debug("%s: unknown RNDIS message 0x%08X len %d\n",
+               printf("%s: unknown RNDIS message 0x%08X len %d\n",
                        __func__ , MsgType, MsgLength);
                {
                        unsigned i;
                        for (i = 0; i < MsgLength; i += 16) {
-                               debug("%03d: "
+                               DBG("%03d: "
                                        " %02x %02x %02x %02x"
                                        " %02x %02x %02x %02x"
                                        " %02x %02x %02x %02x"
                                        " %02x %02x %02x %02x"
                                        "\n",
                                        i,
-                                       buf[i], buf[i+1],
+                                       buf[i], buf [i+1],
                                                buf[i+2], buf[i+3],
-                                       buf[i+4], buf[i+5],
+                                       buf[i+4], buf [i+5],
                                                buf[i+6], buf[i+7],
-                                       buf[i+8], buf[i+9],
+                                       buf[i+8], buf [i+9],
                                                buf[i+10], buf[i+11],
-                                       buf[i+12], buf[i+13],
+                                       buf[i+12], buf [i+13],
                                                buf[i+14], buf[i+15]);
                        }
                }
@@ -1126,117 +1153,154 @@ int rndis_msg_parser(u8 configNr, u8 *buf)
        return -ENOTSUPP;
 }
 
-int rndis_register(int (*rndis_control_ack)(struct eth_device *))
+int rndis_register (int (* rndis_control_ack) (struct eth_device *))
 {
        u8 i;
 
        for (i = 0; i < RNDIS_MAX_CONFIGS; i++) {
-               if (!rndis_per_dev_params[i].used) {
-                       rndis_per_dev_params[i].used = 1;
-                       rndis_per_dev_params[i].ack = rndis_control_ack;
-                       debug("%s: configNr = %d\n", __func__, i);
+               if (!rndis_per_dev_params [i].used) {
+                       rndis_per_dev_params [i].used = 1;
+                       rndis_per_dev_params [i].ack = rndis_control_ack;
+                       DBG("%s: configNr = %d\n", __func__, i);
                        return i;
                }
        }
-       debug("%s failed\n", __func__);
+       DBG("failed\n");
 
        return -1;
 }
 
-void rndis_deregister(int configNr)
+void rndis_deregister (int configNr)
 {
-       debug("%s: configNr = %d\n", __func__, configNr);
+       DBG("%s: \n", __func__ );
 
-       if (configNr >= RNDIS_MAX_CONFIGS)
-               return;
-       rndis_per_dev_params[configNr].used = 0;
+       if (configNr >= RNDIS_MAX_CONFIGS) return;
+       rndis_per_dev_params [configNr].used = 0;
 
        return;
 }
 
-int rndis_set_param_dev(u8 configNr, struct eth_device *dev, int mtu,
-                       struct net_device_stats *stats, u16 *cdc_filter)
+int rndis_set_param_dev (u8 configNr, struct eth_device *dev,
+                        struct eth_device_stats *stats,
+                        u16 *cdc_filter)
 {
-       debug("%s: configNr = %d\n", __func__, configNr);
-       if (!dev || !stats)
-               return -1;
-       if (configNr >= RNDIS_MAX_CONFIGS)
-               return -1;
+       DBG("%s:\n", __func__ );
+//     if (!dev || !stats) return -1;
+       if (configNr >= RNDIS_MAX_CONFIGS) return -1;
 
-       rndis_per_dev_params[configNr].dev = dev;
-       rndis_per_dev_params[configNr].stats = stats;
-       rndis_per_dev_params[configNr].mtu = mtu;
-       rndis_per_dev_params[configNr].filter = cdc_filter;
+       rndis_per_dev_params [configNr].dev = dev;
+       rndis_per_dev_params [configNr].stats = stats;
+       rndis_per_dev_params [configNr].filter = cdc_filter;
 
        return 0;
 }
 
-int rndis_set_param_vendor(u8 configNr, u32 vendorID, const char *vendorDescr)
+int rndis_set_param_vendor (u8 configNr, u32 vendorID, const char *vendorDescr)
 {
-       debug("%s: configNr = %d\n", __func__, configNr);
-       if (!vendorDescr)
-               return -1;
-       if (configNr >= RNDIS_MAX_CONFIGS)
-               return -1;
+       DBG("%s:\n", __func__ );
+       if (!vendorDescr) return -1;
+       if (configNr >= RNDIS_MAX_CONFIGS) return -1;
 
-       rndis_per_dev_params[configNr].vendorID = vendorID;
-       rndis_per_dev_params[configNr].vendorDescr = vendorDescr;
+       rndis_per_dev_params [configNr].vendorID = vendorID;
+       rndis_per_dev_params [configNr].vendorDescr = vendorDescr;
 
        return 0;
 }
 
-int rndis_set_param_medium(u8 configNr, u32 medium, u32 speed)
+int rndis_set_param_medium (u8 configNr, u32 medium, u32 speed)
 {
-       debug("%s: configNr = %d, %u %u\n", __func__, configNr, medium, speed);
-       if (configNr >= RNDIS_MAX_CONFIGS)
-               return -1;
+       DBG("%s: %u %u\n", __func__, medium, speed);
+       if (configNr >= RNDIS_MAX_CONFIGS) return -1;
 
-       rndis_per_dev_params[configNr].medium = medium;
-       rndis_per_dev_params[configNr].speed = speed;
+       rndis_per_dev_params [configNr].medium = medium;
+       rndis_per_dev_params [configNr].speed = speed;
 
        return 0;
 }
 
-void rndis_add_hdr(void *buf, int length)
+rndis_packet_buffer *rndis_packet_create(void *data, int len)
+{
+       struct rndis_packet_msg_type    *header;
+       int header_size, total_size;
+       if (rndis_buffer.in_use) {
+               printf("error: RNDIS packet buffer is currently in use\n");
+               return NULL;
+       }
+       header_size = sizeof(*header);
+       total_size = header_size + len;
+       if (total_size > RNDIS_MAX_PACKET_SIZE) {
+               printf("error: RNDIS packet size %d exceeds %d\n",
+                       total_size, RNDIS_MAX_PACKET_SIZE);
+               return NULL;
+       }
+       header = (struct rndis_packet_msg_type*) rndis_buffer.data;
+       memset(header, 0, header_size);
+       header->MessageType = __constant_cpu_to_le32(REMOTE_NDIS_PACKET_MSG);
+       header->MessageLength = cpu_to_le32(total_size);
+       header->DataOffset = __constant_cpu_to_le32 (36);
+       header->DataLength = cpu_to_le32(len);
+
+       memcpy(rndis_buffer.data + header_size, data, len);
+
+       DBG("Created RNDIS packet of size %d data offset %d total %d\n", len, header_size, total_size);
+       rndis_buffer.len = total_size;
+       rndis_buffer.in_use = 1;
+       return &rndis_buffer;
+}
+
+void rndis_packet_free(rndis_packet_buffer *b)
+{
+       if (b != &rndis_buffer) {
+               printf("error: freeing invalid RNDIS packet\n");
+               return;
+       }
+       rndis_buffer.len = 0;
+       rndis_buffer.in_use = 0;
+}
+
+#if 0
+void rndis_add_hdr (struct sk_buff *skb)
 {
        struct rndis_packet_msg_type    *header;
 
-       header = buf;
-       memset(header, 0, sizeof *header);
+       if (!skb)
+               return;
+       header = (void *) skb_push (skb, sizeof *header);
+       memset (header, 0, sizeof *header);
        header->MessageType = __constant_cpu_to_le32(REMOTE_NDIS_PACKET_MSG);
-       header->MessageLength = cpu_to_le32(length + sizeof *header);
-       header->DataOffset = __constant_cpu_to_le32(36);
-       header->DataLength = cpu_to_le32(length);
+       header->MessageLength = cpu_to_le32(skb->len);
+       header->DataOffset = __constant_cpu_to_le32 (36);
+       header->DataLength = cpu_to_le32(skb->len - sizeof *header);
 }
+#endif
 
-void rndis_free_response(int configNr, u8 *buf)
+void rndis_free_response (int configNr, u8 *buf)
 {
        rndis_resp_t            *r;
        struct list_head        *act, *tmp;
 
-       list_for_each_safe(act, tmp,
-                       &(rndis_per_dev_params[configNr].resp_queue))
+       list_for_each_safe (act, tmp,
+                       &(rndis_per_dev_params [configNr].resp_queue))
        {
-               r = list_entry(act, rndis_resp_t, list);
+               r = list_entry (act, rndis_resp_t, list);
                if (r && r->buf == buf) {
-                       list_del(&r->list);
-                       free(r);
+                       list_del (&r->list);
+                       free (r);
                }
        }
 }
 
-u8 *rndis_get_next_response(int configNr, u32 *length)
+u8 *rndis_get_next_response (int configNr, u32 *length)
 {
        rndis_resp_t            *r;
        struct list_head        *act, *tmp;
 
-       if (!length)
-               return NULL;
+       if (!length) return NULL;
 
-       list_for_each_safe(act, tmp,
-                       &(rndis_per_dev_params[configNr].resp_queue))
+       list_for_each_safe (act, tmp,
+                       &(rndis_per_dev_params [configNr].resp_queue))
        {
-               r = list_entry(act, rndis_resp_t, list);
+               r = list_entry (act, rndis_resp_t, list);
                if (!r->send) {
                        r->send = 1;
                        *length = r->length;
@@ -1247,29 +1311,60 @@ u8 *rndis_get_next_response(int configNr, u32 *length)
        return NULL;
 }
 
-static rndis_resp_t *rndis_add_response(int configNr, u32 length)
+static rndis_resp_t *rndis_add_response (int configNr, u32 length)
 {
        rndis_resp_t    *r;
 
        /* NOTE:  this gets copied into ether.c USB_BUFSIZ bytes ... */
-       r = malloc(sizeof(rndis_resp_t) + length);
-       if (!r)
-               return NULL;
+       r = malloc (sizeof (rndis_resp_t) + length);
+       if (!r) return NULL;
 
        r->buf = (u8 *) (r + 1);
        r->length = length;
        r->send = 0;
 
-       list_add_tail(&r->list,
-               &(rndis_per_dev_params[configNr].resp_queue));
+       list_add_tail (&r->list,
+               &(rndis_per_dev_params [configNr].resp_queue));
        return r;
 }
 
-int rndis_rm_hdr(void *buf, int length)
+int rndis_rm_hdr(void *data, int *len)
 {
+       int i;
+       char *dst = data;
+       char *src = data;
        /* tmp points to a struct rndis_packet_msg_type */
-       __le32          *tmp = buf;
-       int             offs, len;
+       __le32          *tmp = (void *) data;
+       int DataOffset, DataLength;
+       DBG("%s, %d\n", __FUNCTION__, __LINE__);
+
+       /* MessageType, MessageLength */
+       if (__constant_cpu_to_le32(REMOTE_NDIS_PACKET_MSG)
+                       != get_unaligned(tmp++))
+               return -EINVAL;
+       tmp++;
+       DataOffset = get_unaligned_le32(tmp++);
+       DataLength = get_unaligned_le32(tmp++);
+
+       src += DataOffset + 8;
+       if (DataLength > *len)
+               return -EOVERFLOW;
+       
+       for (i=0; i<DataLength; i++)
+               dst[i] = src[i];
+
+       *len = DataLength;
+
+       DBG("RNDIS pkt: offset %d size %d, src %x dst %x\n", DataOffset, DataLength, src, dst);
+
+       return 0;
+}
+
+#if 0
+int rndis_rm_hdr(struct sk_buff *skb)
+{
+       /* tmp points to a struct rndis_packet_msg_type */
+       __le32          *tmp = (void *) skb->data;
 
        /* MessageType, MessageLength */
        if (__constant_cpu_to_le32(REMOTE_NDIS_PACKET_MSG)
@@ -1278,39 +1373,160 @@ int rndis_rm_hdr(void *buf, int length)
        tmp++;
 
        /* DataOffset, DataLength */
-       offs = get_unaligned_le32(tmp++) + 8 /* offset of DataOffset */;
-       if (offs != sizeof(struct rndis_packet_msg_type))
-               debug("%s: unexpected DataOffset: %d\n", __func__, offs);
-       if (offs >= length)
+       if (!skb_pull(skb, get_unaligned_le32(tmp++) + 8))
                return -EOVERFLOW;
+       skb_trim(skb, get_unaligned_le32(tmp++));
+
+       return 0;
+}
+#endif
+
+#ifdef CONFIG_USB_GADGET_DEBUG_FILES
+
+static int rndis_proc_read (char *page, char **start, off_t off, int count, int *eof,
+               void *data)
+{
+       char *out = page;
+       int len;
+       rndis_params *param = (rndis_params *) data;
+
+       out += snprintf (out, count,
+                        "Config Nr. %d\n"
+                        "used      : %s\n"
+                        "state     : %s\n"
+                        "medium    : 0x%08X\n"
+                        "speed     : %d\n"
+                        "cable     : %s\n"
+                        "vendor ID : 0x%08X\n"
+                        "vendor    : %s\n",
+                        param->confignr, (param->used) ? "y" : "n",
+                        ({ char *s = "?";
+                        switch (param->state) {
+                        case RNDIS_UNINITIALIZED:
+                               s = "RNDIS_UNINITIALIZED"; break;
+                        case RNDIS_INITIALIZED:
+                               s = "RNDIS_INITIALIZED"; break;
+                        case RNDIS_DATA_INITIALIZED:
+                               s = "RNDIS_DATA_INITIALIZED"; break;
+                       }; s; }),
+                        param->medium,
+                        (param->media_state) ? 0 : param->speed*100,
+                        (param->media_state) ? "disconnected" : "connected",
+                        param->vendorID, param->vendorDescr);
+
+       len = out - page;
+       len -= off;
+
+       if (len < count) {
+               *eof = 1;
+               if (len <= 0)
+                       return 0;
+       } else
+               len = count;
 
-       len = get_unaligned_le32(tmp++);
-       if (len + sizeof(struct rndis_packet_msg_type) != length)
-               debug("%s: unexpected DataLength: %d, packet length=%d\n",
-                               __func__, len, length);
+       *start = page + off;
+       return len;
+}
+
+static int rndis_proc_write (struct file *file, const char __user *buffer,
+               unsigned long count, void *data)
+{
+       rndis_params *p = data;
+       u32 speed = 0;
+       int i, fl_speed = 0;
+
+       for (i = 0; i < count; i++) {
+               char c;
+               if (get_user(c, buffer))
+                       return -EFAULT;
+               switch (c) {
+               case '0':
+               case '1':
+               case '2':
+               case '3':
+               case '4':
+               case '5':
+               case '6':
+               case '7':
+               case '8':
+               case '9':
+                       fl_speed = 1;
+                       speed = speed*10 + c - '0';
+                       break;
+               case 'C':
+               case 'c':
+                       rndis_signal_connect (p->confignr);
+                       break;
+               case 'D':
+               case 'd':
+                       rndis_signal_disconnect(p->confignr);
+                       break;
+               default:
+                       if (fl_speed) p->speed = speed;
+                       else DBG("%c is not valid\n", c);
+                       break;
+               }
 
-       memmove(buf, buf + offs, len);
+               buffer++;
+       }
 
-       return offs;
+       return count;
 }
 
-int rndis_init(void)
+#define        NAME_TEMPLATE   "driver/rndis-%03d"
+
+static struct proc_dir_entry *rndis_connect_state [RNDIS_MAX_CONFIGS];
+
+#endif /* CONFIG_USB_GADGET_DEBUG_FILES */
+
+
+int rndis_init (void)
 {
        u8 i;
 
        for (i = 0; i < RNDIS_MAX_CONFIGS; i++) {
-               rndis_per_dev_params[i].confignr = i;
-               rndis_per_dev_params[i].used = 0;
-               rndis_per_dev_params[i].state = RNDIS_UNINITIALIZED;
-               rndis_per_dev_params[i].media_state
+#ifdef CONFIG_USB_GADGET_DEBUG_FILES
+               char name [20];
+
+               sprintf (name, NAME_TEMPLATE, i);
+               if (!(rndis_connect_state [i]
+                               = create_proc_entry (name, 0660, NULL)))
+               {
+                       DBG("%s :remove entries", __func__);
+                       while (i) {
+                               sprintf (name, NAME_TEMPLATE, --i);
+                               remove_proc_entry (name, NULL);
+                       }
+                       DBG("\n");
+                       return -EIO;
+               }
+
+               rndis_connect_state [i]->write_proc = rndis_proc_write;
+               rndis_connect_state [i]->read_proc = rndis_proc_read;
+               rndis_connect_state [i]->data = (void *)
+                               (rndis_per_dev_params + i);
+#endif
+               rndis_per_dev_params [i].confignr = i;
+               rndis_per_dev_params [i].used = 0;
+               rndis_per_dev_params [i].state = RNDIS_UNINITIALIZED;
+               rndis_per_dev_params [i].media_state
                                = NDIS_MEDIA_STATE_DISCONNECTED;
-               INIT_LIST_HEAD(&(rndis_per_dev_params[i].resp_queue));
+               INIT_LIST_HEAD (&(rndis_per_dev_params [i].resp_queue));
        }
 
        return 0;
 }
 
-void rndis_exit(void)
+void rndis_exit (void)
 {
-       /* Nothing to do */
+#ifdef CONFIG_USB_GADGET_DEBUG_FILES
+       u8 i;
+       char name [20];
+
+       for (i = 0; i < RNDIS_MAX_CONFIGS; i++) {
+               sprintf (name, NAME_TEMPLATE, i);
+               remove_proc_entry (name, NULL);
+       }
+#endif
 }
+