Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 796cc88c authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

hv_netvsc: style cleanups 



Fix most of the complaints about the style of the code.
Things like extra blank lines and return statements.

Signed-off-by: default avatarStephen Hemminger <sthemmin@microsoft.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e53a9c2a

drivers/net/hyperv/netvsc.c

+2 −16
Original line number Original line Diff line number Diff line
@@ -59,7 +59,6 @@ void netvsc_switch_datapath(struct net_device *ndev, bool vf) 
			       VM_PKT_DATA_INBAND, 0);

			       VM_PKT_DATA_INBAND, 0);

}

}







static struct netvsc_device *alloc_net_device(void)

static struct netvsc_device *alloc_net_device(void)

{

{

	struct netvsc_device *net_device;

	struct netvsc_device *net_device;
@@ -123,7 +122,6 @@ static struct netvsc_device *get_inbound_net_device(struct hv_device *device) 
	return net_device;

	return net_device;

}

}







static int netvsc_destroy_buf(struct hv_device *device)

static int netvsc_destroy_buf(struct hv_device *device)

{

{

	struct nvsp_message *revoke_packet;

	struct nvsp_message *revoke_packet;
@@ -285,7 +283,6 @@ static int netvsc_init_buf(struct hv_device *device) 
		goto cleanup;

		goto cleanup;

	}

	}







	/* Notify the NetVsp of the gpadl handle */

	/* Notify the NetVsp of the gpadl handle */

	init_packet = &net_device->channel_init_pkt;

	init_packet = &net_device->channel_init_pkt;
@@ -437,7 +434,6 @@ static int netvsc_init_buf(struct hv_device *device) 
	return ret;

	return ret;

}

}







/* Negotiate NVSP protocol version */

/* Negotiate NVSP protocol version */

static int negotiate_nvsp_ver(struct hv_device *device,

static int negotiate_nvsp_ver(struct hv_device *device,

			      struct netvsc_device *net_device,

			      struct netvsc_device *net_device,
@@ -593,7 +589,6 @@ int netvsc_device_remove(struct hv_device *device) 
	return 0;

	return 0;

}

}







#define RING_AVAIL_PERCENT_HIWATER 20

#define RING_AVAIL_PERCENT_HIWATER 20

#define RING_AVAIL_PERCENT_LOWATER 10

#define RING_AVAIL_PERCENT_LOWATER 10
@@ -676,13 +671,11 @@ static void netvsc_send_completion(struct netvsc_device *net_device, 
		    !net_device_ctx->start_remove &&

		    !net_device_ctx->start_remove &&

		    (hv_ringbuf_avail_percent(&channel->outbound) >

		    (hv_ringbuf_avail_percent(&channel->outbound) >

		     RING_AVAIL_PERCENT_HIWATER || queue_sends < 1))

		     RING_AVAIL_PERCENT_HIWATER || queue_sends < 1))

				netif_tx_wake_queue(netdev_get_tx_queue(

			netif_tx_wake_queue(netdev_get_tx_queue(ndev, q_idx));

						    ndev, q_idx));

	} else {

	} else {

		netdev_err(ndev, "Unknown send completion packet type- "

		netdev_err(ndev, "Unknown send completion packet type- "

			   "%d received!!\n", nvsp_packet->hdr.msg_type);

			   "%d received!!\n", nvsp_packet->hdr.msg_type);

	}

	}



}

}





static u32 netvsc_get_next_send_section(struct netvsc_device *net_device)

static u32 netvsc_get_next_send_section(struct netvsc_device *net_device)
@@ -1157,7 +1150,6 @@ static void netvsc_receive(struct netvsc_device *net_device, 
		/* Pass it to the upper layer */

		/* Pass it to the upper layer */

		status = rndis_filter_receive(device, netvsc_packet, &data,

		status = rndis_filter_receive(device, netvsc_packet, &data,

					      channel);

					      channel);



	}

	}





	if (!net_device->mrc[q_idx].buf) {

	if (!net_device->mrc[q_idx].buf) {
@@ -1182,7 +1174,6 @@ static void netvsc_receive(struct netvsc_device *net_device, 
	rcd->status = status;

	rcd->status = status;

}

}







static void netvsc_send_table(struct hv_device *hdev,

static void netvsc_send_table(struct hv_device *hdev,

			      struct nvsp_message *nvmsg)

			      struct nvsp_message *nvmsg)

{

{
@@ -1263,7 +1254,6 @@ static void netvsc_process_raw_pkt(struct hv_device *device, 
	}

	}

}

}







void netvsc_channel_cb(void *context)

void netvsc_channel_cb(void *context)

{

{

	int ret;

	int ret;
@@ -1320,8 +1310,6 @@ void netvsc_channel_cb(void *context) 
						       ndev,

						       ndev,

						       request_id,

						       request_id,

						       desc);

						       desc);





			} else {

			} else {

				/*

				/*

				 * We are done for this pass.

				 * We are done for this pass.
@@ -1350,8 +1338,6 @@ void netvsc_channel_cb(void *context) 
		kfree(buffer);

		kfree(buffer);





	netvsc_chk_recv_comp(net_device, channel, q_idx);

	netvsc_chk_recv_comp(net_device, channel, q_idx);



	return;

}

}





/*

/*

drivers/net/hyperv/netvsc_drv.c

+0 −7
Original line number Original line Diff line number Diff line
@@ -40,7 +40,6 @@ 




#include "hyperv_net.h"

#include "hyperv_net.h"







#define RING_SIZE_MIN 64

#define RING_SIZE_MIN 64

#define LINKCHANGE_INT (2 * HZ)

#define LINKCHANGE_INT (2 * HZ)

#define NETVSC_HW_FEATURES	(NETIF_F_RXCSUM | \

#define NETVSC_HW_FEATURES	(NETIF_F_RXCSUM | \
@@ -411,7 +410,6 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net) 
			FIELD_SIZEOF(struct sk_buff, cb));

			FIELD_SIZEOF(struct sk_buff, cb));

	packet = (struct hv_netvsc_packet *)skb->cb;

	packet = (struct hv_netvsc_packet *)skb->cb;







	packet->q_idx = skb_get_queue_mapping(skb);

	packet->q_idx = skb_get_queue_mapping(skb);





	packet->total_data_buflen = skb->len;

	packet->total_data_buflen = skb->len;
@@ -617,7 +615,6 @@ void netvsc_linkstatus_callback(struct hv_device *device_obj, 
	schedule_delayed_work(&ndev_ctx->dwork, 0);

	schedule_delayed_work(&ndev_ctx->dwork, 0);

}

}







static struct sk_buff *netvsc_alloc_recv_skb(struct net_device *net,

static struct sk_buff *netvsc_alloc_recv_skb(struct net_device *net,

				struct hv_netvsc_packet *packet,

				struct hv_netvsc_packet *packet,

				struct ndis_tcp_ip_checksum_info *csum_info,

				struct ndis_tcp_ip_checksum_info *csum_info,
@@ -1271,7 +1268,6 @@ static int netvsc_vf_up(struct net_device *vf_netdev) 
	return NOTIFY_OK;

	return NOTIFY_OK;

}

}







static int netvsc_vf_down(struct net_device *vf_netdev)

static int netvsc_vf_down(struct net_device *vf_netdev)

{

{

	struct net_device *ndev;

	struct net_device *ndev;
@@ -1305,7 +1301,6 @@ static int netvsc_vf_down(struct net_device *vf_netdev) 
	return NOTIFY_OK;

	return NOTIFY_OK;

}

}







static int netvsc_unregister_vf(struct net_device *vf_netdev)

static int netvsc_unregister_vf(struct net_device *vf_netdev)

{

{

	struct net_device *ndev;

	struct net_device *ndev;
@@ -1433,7 +1428,6 @@ static int netvsc_remove(struct hv_device *dev) 
		return 0;

		return 0;

	}

	}







	ndev_ctx = netdev_priv(net);

	ndev_ctx = netdev_priv(net);

	net_device = ndev_ctx->nvdev;

	net_device = ndev_ctx->nvdev;
@@ -1480,7 +1474,6 @@ static struct hv_driver netvsc_drv = { 
	.remove = netvsc_remove,

	.remove = netvsc_remove,

};

};







/*

/*

 * On Hyper-V, every VF interface is matched with a corresponding

 * On Hyper-V, every VF interface is matched with a corresponding

 * synthetic interface. The synthetic interface is presented first

 * synthetic interface. The synthetic interface is presented first

drivers/net/hyperv/rndis_filter.c

+1 −7
Original line number Original line Diff line number Diff line
@@ -721,7 +721,6 @@ static int rndis_filter_set_rss_param(struct rndis_device *rdev, int num_queue) 
	for (i = 0; i < HASH_KEYLEN; i++)

	for (i = 0; i < HASH_KEYLEN; i++)

		keyp[i] = netvsc_hash_key[i];

		keyp[i] = netvsc_hash_key[i];







	ret = rndis_filter_send_request(rdev, request);

	ret = rndis_filter_send_request(rdev, request);

	if (ret != 0)

	if (ret != 0)

		goto cleanup;

		goto cleanup;
@@ -739,7 +738,6 @@ static int rndis_filter_set_rss_param(struct rndis_device *rdev, int num_queue) 
	return ret;

	return ret;

}

}







static int rndis_filter_query_device_link_status(struct rndis_device *dev)

static int rndis_filter_query_device_link_status(struct rndis_device *dev)

{

{

	u32 size = sizeof(u32);

	u32 size = sizeof(u32);
@@ -815,7 +813,6 @@ int rndis_filter_set_packet_filter(struct rndis_device *dev, u32 new_filter) 
	return ret;

	return ret;

}

}







static int rndis_filter_init_device(struct rndis_device *dev)

static int rndis_filter_init_device(struct rndis_device *dev)

{

{

	struct rndis_request *request;

	struct rndis_request *request;
@@ -903,7 +900,6 @@ static void rndis_filter_halt_device(struct rndis_device *dev) 




	if (request)

	if (request)

		put_rndis_request(dev, request);

		put_rndis_request(dev, request);

	return;

}

}





static int rndis_filter_open_device(struct rndis_device *dev)

static int rndis_filter_open_device(struct rndis_device *dev)
@@ -1055,7 +1051,6 @@ int rndis_filter_device_add(struct hv_device *dev, 
	offloads.udp_ip_v6_csum = NDIS_OFFLOAD_PARAMETERS_TX_RX_ENABLED;

	offloads.udp_ip_v6_csum = NDIS_OFFLOAD_PARAMETERS_TX_RX_ENABLED;

	offloads.lso_v2_ipv4 = NDIS_OFFLOAD_PARAMETERS_LSOV2_ENABLED;

	offloads.lso_v2_ipv4 = NDIS_OFFLOAD_PARAMETERS_LSOV2_ENABLED;







	ret = rndis_filter_set_offload_params(net, &offloads);

	ret = rndis_filter_set_offload_params(net, &offloads);

	if (ret)

	if (ret)

		goto err_dev_remv;

		goto err_dev_remv;
@@ -1181,7 +1176,6 @@ void rndis_filter_device_remove(struct hv_device *dev) 
	netvsc_device_remove(dev);

	netvsc_device_remove(dev);

}

}







int rndis_filter_open(struct netvsc_device *nvdev)

int rndis_filter_open(struct netvsc_device *nvdev)

{

{

	if (!nvdev)

	if (!nvdev)