hv_netvsc: Eliminate is_data_pkt from struct hv_netvsc_packet

Eliminate is_data_pkt 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 eebfbe5f2f3d9064c60d1d07514d03ff9d9af186..2f69e31bc07d6e71e89f802b43fed93c105ca5ce 100644 (file)
--- a/drivers/net/hyperv/hyperv_net.h
+++ b/drivers/net/hyperv/hyperv_net.h
@@ -131,7 +131,6 @@ struct ndis_tcp_ip_checksum_info;
 struct hv_netvsc_packet {
        /* Bookkeeping stuff */
        u8 status;
-       u8 is_data_pkt;
        u8 xmit_more; /* from skb */
        u8 cp_partial; /* partial copy into send buffer */
 

diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c
index d18e10cceced1558d86e6d56fe86abc916f22b5a..11b009ebb33fffa0d82b8424160c3d0a1f6e3bb6 100644 (file)
--- a/drivers/net/hyperv/netvsc.c
+++ b/drivers/net/hyperv/netvsc.c
@@ -704,12 +704,14 @@ static u32 netvsc_copy_to_send_buf(struct netvsc_device *net_device,
                                   u32 pend_size,
                                   struct hv_netvsc_packet *packet,
                                   struct rndis_message *rndis_msg,
-                                  struct hv_page_buffer **pb)
+                                  struct hv_page_buffer **pb,
+                                  struct sk_buff *skb)
 {
        char *start = net_device->send_buf;
        char *dest = start + (section_index * net_device->send_section_size)
                     + pend_size;
        int i;
+       bool is_data_pkt = (skb != NULL) ? true : false;
        u32 msg_size = 0;
        u32 padding = 0;
        u32 remain = packet->total_data_buflen % net_device->pkt_align;
@@ -717,7 +719,7 @@ static u32 netvsc_copy_to_send_buf(struct netvsc_device *net_device,
                packet->page_buf_cnt;
 
        /* Add padding */
-       if (packet->is_data_pkt && packet->xmit_more && remain &&
+       if (is_data_pkt && packet->xmit_more && remain &&
            !packet->cp_partial) {
                padding = net_device->pkt_align - remain;
                rndis_msg->msg_len += padding;
@@ -758,7 +760,7 @@ static inline int netvsc_send_pkt(
        u32 ring_avail = hv_ringbuf_avail_percent(&out_channel->outbound);
 
        nvmsg.hdr.msg_type = NVSP_MSG1_TYPE_SEND_RNDIS_PKT;
-       if (packet->is_data_pkt) {
+       if (skb != NULL) {
                /* 0 is RMC_DATA; */
                nvmsg.msg.v1_msg.send_rndis_pkt.channel_type = 0;
        } else {
@@ -868,7 +870,7 @@ int netvsc_send(struct hv_device *device,
        if (msdp->pkt)
                msd_len = msdp->pkt->total_data_buflen;
 
-       try_batch = packet->is_data_pkt && msd_len > 0 && msdp->count <
+       try_batch = (skb != NULL) && msd_len > 0 && msdp->count <
                    net_device->max_pkt;
 
        if (try_batch && msd_len + pktlen + net_device->pkt_align <
@@ -880,7 +882,7 @@ int netvsc_send(struct hv_device *device,
                section_index = msdp->pkt->send_buf_index;
                packet->cp_partial = true;
 
-       } else if (packet->is_data_pkt && pktlen + net_device->pkt_align <
+       } else if ((skb != NULL) && pktlen + net_device->pkt_align <
                   net_device->send_section_size) {
                section_index = netvsc_get_next_send_section(net_device);
                if (section_index != NETVSC_INVALID_INDEX) {
@@ -894,7 +896,7 @@ int netvsc_send(struct hv_device *device,
        if (section_index != NETVSC_INVALID_INDEX) {
                netvsc_copy_to_send_buf(net_device,
                                        section_index, msd_len,
-                                       packet, rndis_msg, pb);
+                                       packet, rndis_msg, pb, skb);
 
                packet->send_buf_index = section_index;
 

diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
index c1078a62a23163c1843afeb3b08e9d170b6debf8..f44e637720bac72961e78e12499e6e6ceee3fb92 100644 (file)
--- a/drivers/net/hyperv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
@@ -478,7 +478,6 @@ check_size:
 
        packet->q_idx = skb_get_queue_mapping(skb);
 
-       packet->is_data_pkt = true;
        packet->total_data_buflen = skb->len;
 
        rndis_msg = (struct rndis_message *)skb->head;

diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
index 53139f7efcb913a6a7678150b430848f65d81573..0b986743abe63c46dc1f2700bd246804190ac2e8 100644 (file)
--- a/drivers/net/hyperv/rndis_filter.c
+++ b/drivers/net/hyperv/rndis_filter.c
@@ -215,7 +215,6 @@ static int rndis_filter_send_request(struct rndis_device *dev,
        /* Setup the packet to send it */
        packet = &req->pkt;
 
-       packet->is_data_pkt = false;
        packet->total_data_buflen = req->request_msg.msg_len;
        packet->page_buf_cnt = 1;