hv_netvsc: Eliminate status from struct hv_netvsc_packet

Eliminate status from struct hv_netvsc_packet.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
index 22ef86828bd0b9b9f5afd33c92ea4d6f9fa4e87f..c4397f1ed43bd0c3842f9411daf3a11cf7ab54d8 100644 (file)
--- a/drivers/net/hyperv/hyperv_net.h
+++ b/drivers/net/hyperv/hyperv_net.h
@@ -130,7 +130,6 @@ struct ndis_tcp_ip_checksum_info;
  */
 struct hv_netvsc_packet {
        /* Bookkeeping stuff */
-       u8 status;
        u8 cp_partial; /* partial copy into send buffer */
 
        u8 rmsg_size; /* RNDIS header and PPI size */

diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
index cd5b65e869ca2bdc708c319f6dc97f4dfe883146..02bab9a7c9ff6e292e1c68856a8a34e860267b1b 100644 (file)
--- a/drivers/net/hyperv/netvsc.c
+++ b/drivers/net/hyperv/netvsc.c
@@ -1045,17 +1045,15 @@ static void netvsc_receive(struct netvsc_device *net_device,
        /* Each range represents 1 RNDIS pkt that contains 1 ethernet frame */
        for (i = 0; i < count; i++) {
                /* Initialize the netvsc packet */
-               netvsc_packet->status = NVSP_STAT_SUCCESS;
                data = (void *)((unsigned long)net_device->
                        recv_buf + vmxferpage_packet->ranges[i].byte_offset);
                netvsc_packet->total_data_buflen =
                                        vmxferpage_packet->ranges[i].byte_count;
 
                /* Pass it to the upper layer */
-               rndis_filter_receive(device, netvsc_packet, &data, channel);
+               status = rndis_filter_receive(device, netvsc_packet, &data,
+                                             channel);
 
-               if (netvsc_packet->status != NVSP_STAT_SUCCESS)
-                       status = NVSP_STAT_FAIL;
        }
 
        netvsc_send_recv_completion(device, channel, net_device,

diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
index d97eeb9e144b47e73acea49fa951b696e7b82674..a34547497d18622b1e0077055bede15e086e8593 100644 (file)
--- a/drivers/net/hyperv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
@@ -471,8 +471,6 @@ check_size:
                        FIELD_SIZEOF(struct sk_buff, cb));
        packet = (struct hv_netvsc_packet *)skb->cb;
 
-       packet->status = 0;
-
        packet->vlan_tci = skb->vlan_tci;
 
        packet->q_idx = skb_get_queue_mapping(skb);
@@ -684,8 +682,7 @@ int netvsc_recv_callback(struct hv_device *device_obj,
 
        net = ((struct netvsc_device *)hv_get_drvdata(device_obj))->ndev;
        if (!net || net->reg_state != NETREG_REGISTERED) {
-               packet->status = NVSP_STAT_FAIL;
-               return 0;
+               return NVSP_STAT_FAIL;
        }
        net_device_ctx = netdev_priv(net);
        rx_stats = this_cpu_ptr(net_device_ctx->rx_stats);
@@ -694,8 +691,7 @@ int netvsc_recv_callback(struct hv_device *device_obj,
        skb = netdev_alloc_skb_ip_align(net, packet->total_data_buflen);
        if (unlikely(!skb)) {
                ++net->stats.rx_dropped;
-               packet->status = NVSP_STAT_FAIL;
-               return 0;
+               return NVSP_STAT_FAIL;
        }
 
        /*

diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
index 3c06aa75ce11165117701e29b4bfb67b4570f703..28adf6acf4819bb49326987cda7eece3010cc3a0 100644 (file)
--- a/drivers/net/hyperv/rndis_filter.c
+++ b/drivers/net/hyperv/rndis_filter.c
@@ -344,7 +344,7 @@ static inline void *rndis_get_ppi(struct rndis_packet *rpkt, u32 type)
        return NULL;
 }
 
-static void rndis_filter_receive_data(struct rndis_device *dev,
+static int rndis_filter_receive_data(struct rndis_device *dev,
                                   struct rndis_message *msg,
                                   struct hv_netvsc_packet *pkt,
                                   void **data,
@@ -371,7 +371,7 @@ static void rndis_filter_receive_data(struct rndis_device *dev,
                           "overflow detected (got %u, min %u)"
                           "...dropping this message!\n",
                           pkt->total_data_buflen, rndis_pkt->data_len);
-               return;
+               return NVSP_STAT_FAIL;
        }
 
        /*
@@ -391,7 +391,8 @@ static void rndis_filter_receive_data(struct rndis_device *dev,
        }
 
        csum_info = rndis_get_ppi(rndis_pkt, TCPIP_CHKSUM_PKTINFO);
-       netvsc_recv_callback(dev->net_dev->dev, pkt, data, csum_info, channel);
+       return netvsc_recv_callback(dev->net_dev->dev, pkt, data,
+                                   csum_info, channel);
 }
 
 int rndis_filter_receive(struct hv_device *dev,
@@ -406,7 +407,7 @@ int rndis_filter_receive(struct hv_device *dev,
        int ret = 0;
 
        if (!net_dev) {
-               ret = -EINVAL;
+               ret = NVSP_STAT_FAIL;
                goto exit;
        }
 
@@ -416,7 +417,7 @@ int rndis_filter_receive(struct hv_device *dev,
        if (!net_dev->extension) {
                netdev_err(ndev, "got rndis message but no rndis device - "
                          "dropping this message!\n");
-               ret = -ENODEV;
+               ret = NVSP_STAT_FAIL;
                goto exit;
        }
 
@@ -424,7 +425,7 @@ int rndis_filter_receive(struct hv_device *dev,
        if (rndis_dev->state == RNDIS_DEV_UNINITIALIZED) {
                netdev_err(ndev, "got rndis message but rndis device "
                           "uninitialized...dropping this message!\n");
-               ret = -ENODEV;
+               ret = NVSP_STAT_FAIL;
                goto exit;
        }
 
@@ -436,8 +437,8 @@ int rndis_filter_receive(struct hv_device *dev,
        switch (rndis_msg->ndis_msg_type) {
        case RNDIS_MSG_PACKET:
                /* data msg */
-               rndis_filter_receive_data(rndis_dev, rndis_msg, pkt,
-                                         data, channel);
+               ret = rndis_filter_receive_data(rndis_dev, rndis_msg, pkt,
+                                               data, channel);
                break;
 
        case RNDIS_MSG_INIT_C:
@@ -460,9 +461,6 @@ int rndis_filter_receive(struct hv_device *dev,
        }
 
 exit:
-       if (ret != 0)
-               pkt->status = NVSP_STAT_FAIL;
-
        return ret;
 }