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

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

hv_netvsc: Rename ind_table to rx_table 



Rename this variable because it is the Receive indirection
table.

Signed-off-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5dc87425

drivers/net/hyperv/hyperv_net.h

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ struct rndis_device { 


	u8 hw_mac_adr[ETH_ALEN];

	u8 rss_key[NETVSC_HASH_KEYLEN];

	u16 ind_table[ITAB_NUM];

	u16 rx_table[ITAB_NUM];

};

drivers/net/hyperv/netvsc_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -1434,7 +1434,7 @@ static int netvsc_get_rxfh(struct net_device *dev, u32 *indir, u8 *key, 
	rndis_dev = ndev->extension;

	if (indir) {

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

			indir[i] = rndis_dev->ind_table[i];

			indir[i] = rndis_dev->rx_table[i];

	}



	if (key)
@@ -1464,7 +1464,7 @@ static int netvsc_set_rxfh(struct net_device *dev, const u32 *indir, 
				return -EINVAL;



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

			rndis_dev->ind_table[i] = indir[i];

			rndis_dev->rx_table[i] = indir[i];

	}



	if (!key) {

drivers/net/hyperv/rndis_filter.c

+3 −3
Original line number Diff line number Diff line
@@ -759,7 +759,7 @@ int rndis_filter_set_rss_param(struct rndis_device *rdev, 
	/* Set indirection table entries */

	itab = (u32 *)(rssp + 1);

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

		itab[i] = rdev->ind_table[i];

		itab[i] = rdev->rx_table[i];



	/* Set hask key values */

	keyp = (u8 *)((unsigned long)rssp + rssp->kashkey_offset);
@@ -1284,8 +1284,8 @@ struct netvsc_device *rndis_filter_device_add(struct hv_device *dev, 
	net_device->num_chn = min(net_device->max_chn, device_info->num_chn);



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

		rndis_device->ind_table[i] = ethtool_rxfh_indir_default(i,

							net_device->num_chn);

		rndis_device->rx_table[i] = ethtool_rxfh_indir_default(

						i, net_device->num_chn);



	atomic_set(&net_device->open_chn, 1);

	vmbus_set_sc_create_callback(dev->channel, netvsc_sc_open);