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

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

hv_netvsc: Allow scatter-gather feature to be tunable 



In a previous patch, the NETIF_F_SG was missing after the code changes.
That caused the SG feature to be "fixed". This patch includes it into
hw_features, so it is tunable again.

Fixes: 23312a3b ("netvsc: negotiate checksum and segmentation parameters")
Signed-off-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 22c63d9c

drivers/net/hyperv/hyperv_net.h

+1 −1
Original line number Diff line number Diff line
@@ -822,7 +822,7 @@ 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_TSO6 | NETIF_F_LRO | NETIF_F_SG)



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

#define VRSS_CHANNEL_MAX 64

drivers/net/hyperv/netvsc_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -2313,8 +2313,8 @@ static int netvsc_probe(struct hv_device *dev, 


	/* hw_features computed in rndis_netdev_set_hwcaps() */

	net->features = net->hw_features |

		NETIF_F_HIGHDMA | NETIF_F_SG |

		NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX;

		NETIF_F_HIGHDMA | NETIF_F_HW_VLAN_CTAG_TX |

		NETIF_F_HW_VLAN_CTAG_RX;

	net->vlan_features = net->features;



	netdev_lockdep_set_classes(net);

drivers/net/hyperv/rndis_filter.c

+1 −0
Original line number Diff line number Diff line
@@ -1207,6 +1207,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;



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

		/* Can checksum TCP */