netvsc: Set maximum GSO size in the right place

bwhacks · gregkh · commit f2d256a2d49f · 2017-02-14T15:22:51.000-08:00
Commit a50af86dd49e "netvsc: reduce maximum GSO size" was wrongly
backported to 4.4-stable.  The maximum size needs to be set before the
net device is registered, in netvsc_probe().

Signed-off-by: Ben Hutchings &lt;ben@decadent.org.uk&gt;
Cc: Stephen Hemminger &lt;sthemmin@microsoft.com&gt;
Cc: "David S. Miller" &lt;davem@davemloft.net&gt;
Signed-off-by: Greg Kroah-Hartman &lt;gregkh@linuxfoundation.org&gt;
diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
@@ -854,7 +854,6 @@ static int netvsc_set_channels(struct net_device *net,
 		}
 		goto recover;
 	}
-	netif_set_gso_max_size(net, NETVSC_GSO_MAX_SIZE);
 
  out:
 	netvsc_open(net);
@@ -1142,6 +1141,7 @@ static int netvsc_probe(struct hv_device *dev,
 	nvdev = hv_get_drvdata(dev);
 	netif_set_real_num_tx_queues(net, nvdev->num_chn);
 	netif_set_real_num_rx_queues(net, nvdev->num_chn);
+	netif_set_gso_max_size(net, NETVSC_GSO_MAX_SIZE);
 
 	ret = register_netdev(net);
 	if (ret != 0) {

Original file line number	Diff line number	Diff line change
`@@ -854,7 +854,6 @@ static int netvsc_set_channels(struct net_device *net,`
`854`	`854`	`}`
`855`	`855`	`goto recover;`
`856`	`856`	`}`
`857`		`- netif_set_gso_max_size(net, NETVSC_GSO_MAX_SIZE);`
`858`	`857`
`859`	`858`	`out:`
`860`	`859`	`netvsc_open(net);`
`@@ -1142,6 +1141,7 @@ static int netvsc_probe(struct hv_device *dev,`
`1142`	`1141`	`nvdev = hv_get_drvdata(dev);`
`1143`	`1142`	`netif_set_real_num_tx_queues(net, nvdev->num_chn);`
`1144`	`1143`	`netif_set_real_num_rx_queues(net, nvdev->num_chn);`
	`1144`	`+ netif_set_gso_max_size(net, NETVSC_GSO_MAX_SIZE);`
`1145`	`1145`
`1146`	`1146`	`ret = register_netdev(net);`
`1147`	`1147`	`if (ret != 0) {`