Merge tag 'mmc-merge-for-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / include / linux / usb / rndis_host.h

diff --git a/include/linux/usb/rndis_host.h b/include/linux/usb/rndis_host.h
index 88fceb718c779273ce4cf82ffc1faed95c762745..d44ef85db177706d47dfb135accf6ceed5ca157f 100644 (file)
--- a/include/linux/usb/rndis_host.h
+++ b/include/linux/usb/rndis_host.h
@@ -20,6 +20,8 @@
 #ifndef        __LINUX_USB_RNDIS_HOST_H
 #define        __LINUX_USB_RNDIS_HOST_H
 
+#include <linux/rndis.h>
+
 /*
  * CONTROL uses CDC "encapsulated commands" with funky notifications.
  *  - control-out:  SEND_ENCAPSULATED
@@ -49,47 +51,6 @@ struct rndis_msg_hdr {
  */
 #define        RNDIS_CONTROL_TIMEOUT_MS        (5 * 1000)
 
-#define RNDIS_MSG_COMPLETION   cpu_to_le32(0x80000000)
-
-/* codes for "msg_type" field of rndis messages;
- * only the data channel uses packet messages (maybe batched);
- * everything else goes on the control channel.
- */
-#define RNDIS_MSG_PACKET       cpu_to_le32(0x00000001) /* 1-N packets */
-#define RNDIS_MSG_INIT         cpu_to_le32(0x00000002)
-#define RNDIS_MSG_INIT_C       (RNDIS_MSG_INIT|RNDIS_MSG_COMPLETION)
-#define RNDIS_MSG_HALT         cpu_to_le32(0x00000003)
-#define RNDIS_MSG_QUERY                cpu_to_le32(0x00000004)
-#define RNDIS_MSG_QUERY_C      (RNDIS_MSG_QUERY|RNDIS_MSG_COMPLETION)
-#define RNDIS_MSG_SET          cpu_to_le32(0x00000005)
-#define RNDIS_MSG_SET_C                (RNDIS_MSG_SET|RNDIS_MSG_COMPLETION)
-#define RNDIS_MSG_RESET                cpu_to_le32(0x00000006)
-#define RNDIS_MSG_RESET_C      (RNDIS_MSG_RESET|RNDIS_MSG_COMPLETION)
-#define RNDIS_MSG_INDICATE     cpu_to_le32(0x00000007)
-#define RNDIS_MSG_KEEPALIVE    cpu_to_le32(0x00000008)
-#define RNDIS_MSG_KEEPALIVE_C  (RNDIS_MSG_KEEPALIVE|RNDIS_MSG_COMPLETION)
-
-/* codes for "status" field of completion messages */
-#define        RNDIS_STATUS_SUCCESS                    cpu_to_le32(0x00000000)
-#define        RNDIS_STATUS_FAILURE                    cpu_to_le32(0xc0000001)
-#define        RNDIS_STATUS_INVALID_DATA               cpu_to_le32(0xc0010015)
-#define        RNDIS_STATUS_NOT_SUPPORTED              cpu_to_le32(0xc00000bb)
-#define        RNDIS_STATUS_MEDIA_CONNECT              cpu_to_le32(0x4001000b)
-#define        RNDIS_STATUS_MEDIA_DISCONNECT           cpu_to_le32(0x4001000c)
-#define        RNDIS_STATUS_MEDIA_SPECIFIC_INDICATION  cpu_to_le32(0x40010012)
-
-/* codes for OID_GEN_PHYSICAL_MEDIUM */
-#define        RNDIS_PHYSICAL_MEDIUM_UNSPECIFIED       cpu_to_le32(0x00000000)
-#define        RNDIS_PHYSICAL_MEDIUM_WIRELESS_LAN      cpu_to_le32(0x00000001)
-#define        RNDIS_PHYSICAL_MEDIUM_CABLE_MODEM       cpu_to_le32(0x00000002)
-#define        RNDIS_PHYSICAL_MEDIUM_PHONE_LINE        cpu_to_le32(0x00000003)
-#define        RNDIS_PHYSICAL_MEDIUM_POWER_LINE        cpu_to_le32(0x00000004)
-#define        RNDIS_PHYSICAL_MEDIUM_DSL               cpu_to_le32(0x00000005)
-#define        RNDIS_PHYSICAL_MEDIUM_FIBRE_CHANNEL     cpu_to_le32(0x00000006)
-#define        RNDIS_PHYSICAL_MEDIUM_1394              cpu_to_le32(0x00000007)
-#define        RNDIS_PHYSICAL_MEDIUM_WIRELESS_WAN      cpu_to_le32(0x00000008)
-#define        RNDIS_PHYSICAL_MEDIUM_MAX               cpu_to_le32(0x00000009)
-
 struct rndis_data_hdr {
        __le32  msg_type;               /* RNDIS_MSG_PACKET */
        __le32  msg_len;                /* rndis_data_hdr + data_len + pad */
@@ -222,29 +183,6 @@ struct rndis_keepalive_c { /* IN (optionally OUT) */
        __le32  status;
 } __attribute__ ((packed));
 
-/* NOTE:  about 30 OIDs are "mandatory" for peripherals to support ... and
- * there are gobs more that may optionally be supported.  We'll avoid as much
- * of that mess as possible.
- */
-#define OID_802_3_PERMANENT_ADDRESS    cpu_to_le32(0x01010101)
-#define OID_GEN_MAXIMUM_FRAME_SIZE     cpu_to_le32(0x00010106)
-#define OID_GEN_CURRENT_PACKET_FILTER  cpu_to_le32(0x0001010e)
-#define OID_GEN_PHYSICAL_MEDIUM                cpu_to_le32(0x00010202)
-
-/* packet filter bits used by OID_GEN_CURRENT_PACKET_FILTER */
-#define RNDIS_PACKET_TYPE_DIRECTED             cpu_to_le32(0x00000001)
-#define RNDIS_PACKET_TYPE_MULTICAST            cpu_to_le32(0x00000002)
-#define RNDIS_PACKET_TYPE_ALL_MULTICAST                cpu_to_le32(0x00000004)
-#define RNDIS_PACKET_TYPE_BROADCAST            cpu_to_le32(0x00000008)
-#define RNDIS_PACKET_TYPE_SOURCE_ROUTING       cpu_to_le32(0x00000010)
-#define RNDIS_PACKET_TYPE_PROMISCUOUS          cpu_to_le32(0x00000020)
-#define RNDIS_PACKET_TYPE_SMT                  cpu_to_le32(0x00000040)
-#define RNDIS_PACKET_TYPE_ALL_LOCAL            cpu_to_le32(0x00000080)
-#define RNDIS_PACKET_TYPE_GROUP                        cpu_to_le32(0x00001000)
-#define RNDIS_PACKET_TYPE_ALL_FUNCTIONAL       cpu_to_le32(0x00002000)
-#define RNDIS_PACKET_TYPE_FUNCTIONAL           cpu_to_le32(0x00004000)
-#define RNDIS_PACKET_TYPE_MAC_FRAME            cpu_to_le32(0x00008000)
-
 /* default filter used with RNDIS devices */
 #define RNDIS_DEFAULT_FILTER ( \
        RNDIS_PACKET_TYPE_DIRECTED | \