kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/drivers/net/ethernet/intel/e1000/e1000_ethtool.c
..
..
@@ -533,8 +533,6 @@
533
533
 
534
534
 	strlcpy(drvinfo->driver,  e1000_driver_name,
535
535
 		sizeof(drvinfo->driver));
536
-	strlcpy(drvinfo->version, e1000_driver_version,
537
-		sizeof(drvinfo->version));
538
536
 
539
537
 	strlcpy(drvinfo->bus_info, pci_name(adapter->pdev),
540
538
 		sizeof(drvinfo->bus_info));
..
..
@@ -936,8 +934,7 @@
936
934
 						 txdr->buffer_info[i].dma,
937
935
 						 txdr->buffer_info[i].length,
938
936
 						 DMA_TO_DEVICE);
939
-			if (txdr->buffer_info[i].skb)
940
-				dev_kfree_skb(txdr->buffer_info[i].skb);
937
+			dev_kfree_skb(txdr->buffer_info[i].skb);
941
938
 		}
942
939
 	}
943
940
 
..
..
@@ -992,8 +989,8 @@
992
989
 
993
990
 	txdr->size = txdr->count * sizeof(struct e1000_tx_desc);
994
991
 	txdr->size = ALIGN(txdr->size, 4096);
995
-	txdr->desc = dma_zalloc_coherent(&pdev->dev, txdr->size, &txdr->dma,
996
-					 GFP_KERNEL);
992
+	txdr->desc = dma_alloc_coherent(&pdev->dev, txdr->size, &txdr->dma,
993
+					GFP_KERNEL);
997
994
 	if (!txdr->desc) {
998
995
 		ret_val = 2;
999
996
 		goto err_nomem;
..
..
@@ -1050,8 +1047,8 @@
1050
1047
 	}
1051
1048
 
1052
1049
 	rxdr->size = rxdr->count * sizeof(struct e1000_rx_desc);
1053
-	rxdr->desc = dma_zalloc_coherent(&pdev->dev, rxdr->size, &rxdr->dma,
1054
-					 GFP_KERNEL);
1050
+	rxdr->desc = dma_alloc_coherent(&pdev->dev, rxdr->size, &rxdr->dma,
1051
+					GFP_KERNEL);
1055
1052
 	if (!rxdr->desc) {
1056
1053
 		ret_val = 6;
1057
1054
 		goto err_nomem;
..
..
@@ -1359,8 +1356,8 @@
1359
1356
 	memset(skb->data, 0xFF, frame_size);
1360
1357
 	frame_size &= ~1;
1361
1358
 	memset(&skb->data[frame_size / 2], 0xAA, frame_size / 2 - 1);
1362
-	memset(&skb->data[frame_size / 2 + 10], 0xBE, 1);
1363
-	memset(&skb->data[frame_size / 2 + 12], 0xAF, 1);
1359
+	skb->data[frame_size / 2 + 10] = 0xBE;
1360
+	skb->data[frame_size / 2 + 12] = 0xAF;
1364
1361
 }
1365
1362
 
1366
1363
 static int e1000_check_lbtest_frame(const unsigned char *data,
..
..
@@ -1853,6 +1850,7 @@
1853
1850
 }
1854
1851
 
1855
1852
 static const struct ethtool_ops e1000_ethtool_ops = {
1853
+	.supported_coalesce_params = ETHTOOL_COALESCE_RX_USECS,
1856
1854
 	.get_drvinfo		= e1000_get_drvinfo,
1857
1855
 	.get_regs_len		= e1000_get_regs_len,
1858
1856
 	.get_regs		= e1000_get_regs,