enable docker ppp

hc

2023-12-09 95099d4622f8cb224d94e314c7a8e0df60b13f87

 kernel/drivers/scsi/csiostor/csio_lnode.c
..
..
@@ -1187,7 +1187,6 @@
1187
1187
 		break;
1188
1188
 
1189
1189
 	case CSIO_LNE_LINK_DOWN:
1190
-		/* Fall through */
1191
1190
 	case CSIO_LNE_DOWN_LINK:
1192
1191
 		csio_set_state(&ln->sm, csio_lns_uninit);
1193
1192
 		if (csio_is_phys_ln(ln)) {
..
..
@@ -1848,8 +1847,8 @@
1848
1847
 	/* Allocate Dma buffers for FDMI response Payload */
1849
1848
 	dma_buf = &ln->mgmt_req->dma_buf;
1850
1849
 	dma_buf->len = 2048;
1851
-	dma_buf->vaddr = pci_alloc_consistent(hw->pdev, dma_buf->len,
1852
-						&dma_buf->paddr);
1850
+	dma_buf->vaddr = dma_alloc_coherent(&hw->pdev->dev, dma_buf->len,
1851
+						&dma_buf->paddr, GFP_KERNEL);
1853
1852
 	if (!dma_buf->vaddr) {
1854
1853
 		csio_err(hw, "Failed to alloc DMA buffer for FDMI!\n");
1855
1854
 		kfree(ln->mgmt_req);
..
..
@@ -1876,7 +1875,7 @@
1876
1875
 
1877
1876
 	dma_buf = &ln->mgmt_req->dma_buf;
1878
1877
 	if (dma_buf->vaddr)
1879
-		pci_free_consistent(hw->pdev, dma_buf->len, dma_buf->vaddr,
1878
+		dma_free_coherent(&hw->pdev->dev, dma_buf->len, dma_buf->vaddr,
1880
1879
 				    dma_buf->paddr);
1881
1880
 
1882
1881
 	kfree(ln->mgmt_req);
..
..
@@ -1992,7 +1991,7 @@
1992
1991
 csio_ln_init(struct csio_lnode *ln)
1993
1992
 {
1994
1993
 	int rv = -EINVAL;
1995
-	struct csio_lnode *rln, *pln;
1994
+	struct csio_lnode *pln;
1996
1995
 	struct csio_hw *hw = csio_lnode_to_hw(ln);
1997
1996
 
1998
1997
 	csio_init_state(&ln->sm, csio_lns_uninit);
..
..
@@ -2022,7 +2021,6 @@
2022
2021
 		 * THe rest is common for non-root physical and NPIV lnodes.
2023
2022
 		 * Just get references to all other modules
2024
2023
 		 */
2025
-		rln = csio_root_lnode(ln);
2026
2024
 
2027
2025
 		if (csio_is_npiv_ln(ln)) {
2028
2026
 			/* NPIV */
..
..
@@ -2069,10 +2067,9 @@
2069
2067
 	ln->fcfinfo = NULL;
2070
2068
 }
2071
2069
 
2072
-/**
2070
+/*
2073
2071
  * csio_lnode_init - Initialize the members of an lnode.
2074
2072
  * @ln:		lnode
2075
- *
2076
2073
  */
2077
2074
 int
2078
2075
 csio_lnode_init(struct csio_lnode *ln, struct csio_hw *hw,