usb/net: rndis: merge command codes

Switch the hyperv filter and rndis gadget driver to use the same command
enumerators as the other drivers and delete the surplus command codes.

Reviewed-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 21 insertions, 21 deletions

diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
index 0d1034839d68..981ebb115637 100644
--- a/drivers/net/hyperv/rndis_filter.c
+++ b/drivers/net/hyperv/rndis_filter.c
@@ -129,8 +129,8 @@ static void dump_rndis_message(struct hv_device *hv_dev,
         netdev = net_device->ndev;
 
         switch (rndis_msg->ndis_msg_type) {
-        case REMOTE_NDIS_PACKET_MSG:
-                netdev_dbg(netdev, "REMOTE_NDIS_PACKET_MSG (len %u, "
+        case RNDIS_MSG_PACKET:
+                netdev_dbg(netdev, "RNDIS_MSG_PACKET (len %u, "
                            "data offset %u data len %u, # oob %u, "
                            "oob offset %u, oob len %u, pkt offset %u, "
                            "pkt len %u\n",
@@ -144,8 +144,8 @@ static void dump_rndis_message(struct hv_device *hv_dev,
                            rndis_msg->msg.pkt.per_pkt_info_len);
                 break;
 
-        case REMOTE_NDIS_INITIALIZE_CMPLT:
-                netdev_dbg(netdev, "REMOTE_NDIS_INITIALIZE_CMPLT "
+        case RNDIS_MSG_INIT_C:
+                netdev_dbg(netdev, "RNDIS_MSG_INIT_C "
                         "(len %u, id 0x%x, status 0x%x, major %d, minor %d, "
                         "device flags %d, max xfer size 0x%x, max pkts %u, "
                         "pkt aligned %u)\n",
@@ -162,8 +162,8 @@ static void dump_rndis_message(struct hv_device *hv_dev,
                            pkt_alignment_factor);
                 break;
 
-        case REMOTE_NDIS_QUERY_CMPLT:
-                netdev_dbg(netdev, "REMOTE_NDIS_QUERY_CMPLT "
+        case RNDIS_MSG_QUERY_C:
+                netdev_dbg(netdev, "RNDIS_MSG_QUERY_C "
                         "(len %u, id 0x%x, status 0x%x, buf len %u, "
                         "buf offset %u)\n",
                         rndis_msg->msg_len,
@@ -175,16 +175,16 @@ static void dump_rndis_message(struct hv_device *hv_dev,
                            info_buf_offset);
                 break;
 
-        case REMOTE_NDIS_SET_CMPLT:
+        case RNDIS_MSG_SET_C:
                 netdev_dbg(netdev,
-                        "REMOTE_NDIS_SET_CMPLT (len %u, id 0x%x, status 0x%x)\n",
+                        "RNDIS_MSG_SET_C (len %u, id 0x%x, status 0x%x)\n",
                         rndis_msg->msg_len,
                         rndis_msg->msg.set_complete.req_id,
                         rndis_msg->msg.set_complete.status);
                 break;
 
-        case REMOTE_NDIS_INDICATE_STATUS_MSG:
-                netdev_dbg(netdev, "REMOTE_NDIS_INDICATE_STATUS_MSG "
+        case RNDIS_MSG_INDICATE:
+                netdev_dbg(netdev, "RNDIS_MSG_INDICATE "
                         "(len %u, status 0x%x, buf len %u, buf offset %u)\n",
                         rndis_msg->msg_len,
                         rndis_msg->msg.indicate_status.status,
@@ -264,7 +264,7 @@ static void rndis_filter_receive_response(struct rndis_device *dev,
                                 sizeof(struct rndis_filter_packet));
 
                         if (resp->ndis_msg_type ==
-                            REMOTE_NDIS_RESET_CMPLT) {
+                            RNDIS_MSG_RESET_C) {
                                 /* does not have a request id field */
                                 request->response_msg.msg.reset_complete.
                                         status = RNDIS_STATUS_BUFFER_OVERFLOW;
@@ -415,19 +415,19 @@ int rndis_filter_receive(struct hv_device *dev,
         dump_rndis_message(dev, rndis_msg);
 
         switch (rndis_msg->ndis_msg_type) {
-        case REMOTE_NDIS_PACKET_MSG:
+        case RNDIS_MSG_PACKET:
                 /* data msg */
                 rndis_filter_receive_data(rndis_dev, rndis_msg, pkt);
                 break;
 
-        case REMOTE_NDIS_INITIALIZE_CMPLT:
-        case REMOTE_NDIS_QUERY_CMPLT:
-        case REMOTE_NDIS_SET_CMPLT:
+        case RNDIS_MSG_INIT_C:
+        case RNDIS_MSG_QUERY_C:
+        case RNDIS_MSG_SET_C:
                 /* completion msgs */
                 rndis_filter_receive_response(rndis_dev, rndis_msg);
                 break;
 
-        case REMOTE_NDIS_INDICATE_STATUS_MSG:
+        case RNDIS_MSG_INDICATE:
                 /* notification msgs */
                 rndis_filter_receive_indicate_status(rndis_dev, rndis_msg);
                 break;
@@ -456,7 +456,7 @@ static int rndis_filter_query_device(struct rndis_device *dev, u32 oid,
                 return -EINVAL;
 
         *result_size = 0;
-        request = get_rndis_request(dev, REMOTE_NDIS_QUERY_MSG,
+        request = get_rndis_request(dev, RNDIS_MSG_QUERY,
                         RNDIS_MESSAGE_SIZE(struct rndis_query_request));
         if (!request) {
                 ret = -ENOMEM;
@@ -536,7 +536,7 @@ int rndis_filter_set_packet_filter(struct rndis_device *dev, u32 new_filter)
 
         ndev = dev->net_dev->ndev;
 
-        request = get_rndis_request(dev, REMOTE_NDIS_SET_MSG,
+        request = get_rndis_request(dev, RNDIS_MSG_SET,
                         RNDIS_MESSAGE_SIZE(struct rndis_set_request) +
                         sizeof(u32));
         if (!request) {
@@ -588,7 +588,7 @@ static int rndis_filter_init_device(struct rndis_device *dev)
         u32 status;
         int ret, t;
 
-        request = get_rndis_request(dev, REMOTE_NDIS_INITIALIZE_MSG,
+        request = get_rndis_request(dev, RNDIS_MSG_INIT,
                         RNDIS_MESSAGE_SIZE(struct rndis_initialize_request));
         if (!request) {
                 ret = -ENOMEM;
@@ -641,7 +641,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
         struct rndis_halt_request *halt;
 
         /* Attempt to do a rndis device halt */
-        request = get_rndis_request(dev, REMOTE_NDIS_HALT_MSG,
+        request = get_rndis_request(dev, RNDIS_MSG_HALT,
                                 RNDIS_MESSAGE_SIZE(struct rndis_halt_request));
         if (!request)
                 goto cleanup;
@@ -805,7 +805,7 @@ int rndis_filter_send(struct hv_device *dev,
         if (isvlan)
                 rndis_msg_size += NDIS_VLAN_PPI_SIZE;
 
-        rndis_msg->ndis_msg_type = REMOTE_NDIS_PACKET_MSG;
+        rndis_msg->ndis_msg_type = RNDIS_MSG_PACKET;
         rndis_msg->msg_len = pkt->total_data_buflen +
                                       rndis_msg_size;