Commit 6f3aeb1b authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Jakub Kicinski
Browse files

hv_netvsc: make recording RSS hash depend on feature flag 



The recording of RSS hash should be controlled by NETIF_F_RXHASH.

Fixes: 1fac7ca4 ("hv_netvsc: record hardware hash in skb")
Suggested-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarStephen Hemminger <sthemmin@microsoft.com>
Signed-off-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Reviewed-by: default avatarMichael Kelley <mikelley@microsoft.com>
Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
parent fc5141cb

drivers/net/hyperv/hyperv_net.h

+2 −1
Original line number Diff line number Diff line
@@ -823,7 +823,8 @@ struct nvsp_message { 


#define NETVSC_SUPPORTED_HW_FEATURES (NETIF_F_RXCSUM | NETIF_F_IP_CSUM | \

				      NETIF_F_TSO | NETIF_F_IPV6_CSUM | \

				      NETIF_F_TSO6 | NETIF_F_LRO | NETIF_F_SG)

				      NETIF_F_TSO6 | NETIF_F_LRO | \

				      NETIF_F_SG | NETIF_F_RXHASH)



#define VRSS_SEND_TAB_SIZE 16  /* must be power of 2 */

#define VRSS_CHANNEL_MAX 64

drivers/net/hyperv/netvsc_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -803,7 +803,7 @@ static struct sk_buff *netvsc_alloc_recv_skb(struct net_device *net, 
			skb->ip_summed = CHECKSUM_UNNECESSARY;

	}



	if (hash_info)

	if (hash_info && (net->features & NETIF_F_RXHASH))

		skb_set_hash(skb, *hash_info, PKT_HASH_TYPE_L4);



	if (vlan) {

drivers/net/hyperv/rndis_filter.c

+1 −0
Original line number Diff line number Diff line
@@ -1214,6 +1214,7 @@ static int rndis_netdev_set_hwcaps(struct rndis_device *rndis_device, 
	/* Compute tx offload settings based on hw capabilities */

	net->hw_features |= NETIF_F_RXCSUM;

	net->hw_features |= NETIF_F_SG;

	net->hw_features |= NETIF_F_RXHASH;



	if ((hwcaps.csum.ip4_txcsum & NDIS_TXCSUM_ALL_TCP4) == NDIS_TXCSUM_ALL_TCP4) {

		/* Can checksum TCP */

CRA Git | Maintained and supported by SUSTech CRA and CCSE