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

Commit dedb459e authored by Haiyang Zhang's avatar Haiyang Zhang Committed by David S. Miller
Browse files

hv_netvsc: Remove unnecessary var link_state from struct netvsc_device_info 



We simply use rndis_device->link_state in the netdev_dbg. The variable,
link_state from struct netvsc_device_info, is not used anywhere else.

Signed-off-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Reviewed-by: default avatarStephen Hemminger <sthemmin@microsoft.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 00a3855d

drivers/net/hyperv/hyperv_net.h

+3 −2
Original line number Original line Diff line number Diff line
@@ -146,7 +146,6 @@ struct hv_netvsc_packet { 




struct netvsc_device_info {

struct netvsc_device_info {

	unsigned char mac_adr[ETH_ALEN];

	unsigned char mac_adr[ETH_ALEN];

	bool link_state;	/* 0 - link up, 1 - link down */

	int  ring_size;

	int  ring_size;

	u32  max_num_vrss_chns;

	u32  max_num_vrss_chns;

	u32  num_chn;

	u32  num_chn;
@@ -165,7 +164,7 @@ struct rndis_device { 
	struct net_device *ndev;

	struct net_device *ndev;





	enum rndis_device_state state;

	enum rndis_device_state state;

	bool link_state;



	atomic_t new_req_id;

	atomic_t new_req_id;





	spinlock_t request_lock;

	spinlock_t request_lock;
@@ -173,6 +172,8 @@ struct rndis_device { 




	struct work_struct mcast_work;

	struct work_struct mcast_work;





	bool link_state;        /* 0 - link up, 1 - link down */



	u8 hw_mac_adr[ETH_ALEN];

	u8 hw_mac_adr[ETH_ALEN];

	u8 rss_key[NETVSC_HASH_KEYLEN];

	u8 rss_key[NETVSC_HASH_KEYLEN];

	u16 ind_table[ITAB_NUM];

	u16 ind_table[ITAB_NUM];

drivers/net/hyperv/rndis_filter.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -1185,11 +1185,9 @@ int rndis_filter_device_add(struct hv_device *dev, 




	rndis_filter_query_device_link_status(rndis_device);

	rndis_filter_query_device_link_status(rndis_device);





	device_info->link_state = rndis_device->link_state;



	netdev_dbg(net, "Device MAC %pM link state %s\n",

	netdev_dbg(net, "Device MAC %pM link state %s\n",

		   rndis_device->hw_mac_adr,

		   rndis_device->hw_mac_adr,

		   device_info->link_state ? "down" : "up");

		   rndis_device->link_state ? "down" : "up");





	if (net_device->nvsp_version < NVSP_PROTOCOL_VERSION_5)

	if (net_device->nvsp_version < NVSP_PROTOCOL_VERSION_5)

		return 0;

		return 0;