3 files changed, 29 insertions, 45 deletions

diff --git a/drivers/usb/gadget/f_rndis.c b/drivers/usb/gadget/f_rndis.c
index 52343654f5df..d4f823f463e9 100644
--- a/drivers/usb/gadget/f_rndis.c
+++ b/drivers/usb/gadget/f_rndis.c
@@ -637,7 +637,7 @@ static void rndis_open(struct gether *geth)
 
         DBG(cdev, "%s\n", __func__);
 
-        rndis_set_param_medium(rndis->config, NDIS_MEDIUM_802_3,
+        rndis_set_param_medium(rndis->config, RNDIS_MEDIUM_802_3,
                                 bitrate(cdev->gadget) / 100);
         rndis_signal_connect(rndis->config);
 }
@@ -648,7 +648,7 @@ static void rndis_close(struct gether *geth)
 
         DBG(geth->func.config->cdev, "%s\n", __func__);
 
-        rndis_set_param_medium(rndis->config, NDIS_MEDIUM_802_3, 0);
+        rndis_set_param_medium(rndis->config, RNDIS_MEDIUM_802_3, 0);
         rndis_signal_disconnect(rndis->config);
 }
 
@@ -765,7 +765,7 @@ rndis_bind(struct usb_configuration *c, struct usb_function *f)
                 goto fail;
         rndis->config = status;
 
-        rndis_set_param_medium(rndis->config, NDIS_MEDIUM_802_3, 0);
+        rndis_set_param_medium(rndis->config, RNDIS_MEDIUM_802_3, 0);
         rndis_set_host_mac(rndis->config, rndis->ethaddr);
 
 #if 0
diff --git a/drivers/usb/gadget/rndis.c b/drivers/usb/gadget/rndis.c
index 79ed261c88c1..d9086caab64b 100644
--- a/drivers/usb/gadget/rndis.c
+++ b/drivers/usb/gadget/rndis.c
@@ -252,7 +252,7 @@ static int gen_ndis_query_resp(int configNr, u32 OID, u8 *buf,
                 if (rndis_debug > 1)
                         pr_debug("%s: RNDIS_OID_GEN_LINK_SPEED\n", __func__);
                 if (rndis_per_dev_params[configNr].media_state
-                                == NDIS_MEDIA_STATE_DISCONNECTED)
+                                == RNDIS_MEDIA_STATE_DISCONNECTED)
                         *outbuf = cpu_to_le32(0);
                 else
                         *outbuf = cpu_to_le32(
@@ -758,7 +758,7 @@ static int rndis_indicate_status_msg(int configNr, u32 status)
 int rndis_signal_connect(int configNr)
 {
         rndis_per_dev_params[configNr].media_state
-                        = NDIS_MEDIA_STATE_CONNECTED;
+                        = RNDIS_MEDIA_STATE_CONNECTED;
         return rndis_indicate_status_msg(configNr,
                                           RNDIS_STATUS_MEDIA_CONNECT);
 }
@@ -766,7 +766,7 @@ int rndis_signal_connect(int configNr)
 int rndis_signal_disconnect(int configNr)
 {
         rndis_per_dev_params[configNr].media_state
-                        = NDIS_MEDIA_STATE_DISCONNECTED;
+                        = RNDIS_MEDIA_STATE_DISCONNECTED;
         return rndis_indicate_status_msg(configNr,
                                           RNDIS_STATUS_MEDIA_DISCONNECT);
 }
@@ -1173,7 +1173,7 @@ int rndis_init(void)
                 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;
+                                = RNDIS_MEDIA_STATE_DISCONNECTED;
                 INIT_LIST_HEAD(&(rndis_per_dev_params[i].resp_queue));
         }
 
diff --git a/include/linux/rndis.h b/include/linux/rndis.h
index 2e0b1bd108c9..485795930013 100644
--- a/include/linux/rndis.h
+++ b/include/linux/rndis.h
@@ -112,6 +112,28 @@
 #define RNDIS_PHYSICAL_MEDIUM_WIRELESS_WAN      0x00000008
 #define RNDIS_PHYSICAL_MEDIUM_MAX               0x00000009
 
+/*  Remote NDIS medium types. */
+#define RNDIS_MEDIUM_UNSPECIFIED                0x00000000
+#define RNDIS_MEDIUM_802_3                      0x00000000
+#define RNDIS_MEDIUM_802_5                      0x00000001
+#define RNDIS_MEDIUM_FDDI                       0x00000002
+#define RNDIS_MEDIUM_WAN                        0x00000003
+#define RNDIS_MEDIUM_LOCAL_TALK                 0x00000004
+#define RNDIS_MEDIUM_ARCNET_RAW                 0x00000006
+#define RNDIS_MEDIUM_ARCNET_878_2               0x00000007
+#define RNDIS_MEDIUM_ATM                        0x00000008
+#define RNDIS_MEDIUM_WIRELESS_LAN               0x00000009
+#define RNDIS_MEDIUM_IRDA                       0x0000000A
+#define RNDIS_MEDIUM_BPC                        0x0000000B
+#define RNDIS_MEDIUM_CO_WAN                     0x0000000C
+#define RNDIS_MEDIUM_1394                       0x0000000D
+/* Not a real medium, defined as an upper-bound */
+#define RNDIS_MEDIUM_MAX                        0x0000000E
+
+/* Remote NDIS medium connection states. */
+#define RNDIS_MEDIA_STATE_CONNECTED             0x00000000
+#define RNDIS_MEDIA_STATE_DISCONNECTED          0x00000001
+
 /* packet filter bits used by RNDIS_OID_GEN_CURRENT_PACKET_FILTER */
 #define RNDIS_PACKET_TYPE_DIRECTED              0x00000001
 #define RNDIS_PACKET_TYPE_MULTICAST             0x00000002
@@ -163,21 +185,6 @@
 #define NDIS_MINIPORT_SUPPORTS_CANCEL_SEND_PACKETS    0x00800000
 #define NDIS_MINIPORT_64BITS_DMA                      0x01000000
 
-#define NDIS_MEDIUM_802_3               0x00000000
-#define NDIS_MEDIUM_802_5               0x00000001
-#define NDIS_MEDIUM_FDDI                0x00000002
-#define NDIS_MEDIUM_WAN                 0x00000003
-#define NDIS_MEDIUM_LOCAL_TALK          0x00000004
-#define NDIS_MEDIUM_DIX                 0x00000005
-#define NDIS_MEDIUM_ARCENT_RAW          0x00000006
-#define NDIS_MEDIUM_ARCENT_878_2        0x00000007
-#define NDIS_MEDIUM_ATM                 0x00000008
-#define NDIS_MEDIUM_WIRELESS_LAN        0x00000009
-#define NDIS_MEDIUM_IRDA                0x0000000A
-#define NDIS_MEDIUM_BPC                 0x0000000B
-#define NDIS_MEDIUM_CO_WAN              0x0000000C
-#define NDIS_MEDIUM_1394                0x0000000D
-
 #define NDIS_PACKET_TYPE_DIRECTED       0x00000001
 #define NDIS_PACKET_TYPE_MULTICAST      0x00000002
 #define NDIS_PACKET_TYPE_ALL_MULTICAST  0x00000004
@@ -191,9 +198,6 @@
 #define NDIS_PACKET_TYPE_FUNCTIONAL     0x00000400
 #define NDIS_PACKET_TYPE_MAC_FRAME      0x00000800
 
-#define NDIS_MEDIA_STATE_CONNECTED      0x00000000
-#define NDIS_MEDIA_STATE_DISCONNECTED   0x00000001
-
 #define NDIS_MAC_OPTION_COPY_LOOKAHEAD_DATA     0x00000001
 #define NDIS_MAC_OPTION_RECEIVE_SERIALIZED      0x00000002
 #define NDIS_MAC_OPTION_TRANSFERS_NOT_PEND      0x00000004
@@ -421,23 +425,3 @@
  * driver and remote device, if necessary.
  */
 #define REMOTE_NDIS_BUS_MSG                     0xff000001
-
-/*  Remote NDIS medium types. */
-#define RNDIS_MEDIUM_802_3                      0x00000000
-#define RNDIS_MEDIUM_802_5                      0x00000001
-#define RNDIS_MEDIUM_FDDI                               0x00000002
-#define RNDIS_MEDIUM_WAN                                0x00000003
-#define RNDIS_MEDIUM_LOCAL_TALK                 0x00000004
-#define RNDIS_MEDIUM_ARCNET_RAW                 0x00000006
-#define RNDIS_MEDIUM_ARCNET_878_2                       0x00000007
-#define RNDIS_MEDIUM_ATM                                0x00000008
-#define RNDIS_MEDIUM_WIRELESS_WAN                       0x00000009
-#define RNDIS_MEDIUM_IRDA                               0x0000000a
-#define RNDIS_MEDIUM_CO_WAN                     0x0000000b
-/* Not a real medium, defined as an upper-bound */
-#define RNDIS_MEDIUM_MAX                                0x0000000d
-
-
-/* Remote NDIS medium connection states. */
-#define RNDIS_MEDIA_STATE_CONNECTED             0x00000000
-#define RNDIS_MEDIA_STATE_DISCONNECTED          0x00000001