2 files changed, 7 insertions, 7 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));
         }