kernel: bump 4.9 to 4.9.191
Refreshed all patches. Compile-tested on: none Runtime-tested on: none Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
This commit is contained in:
		
							parent
							
								
									a858db3136
								
							
						
					
					
						commit
						3b6b66529f
					
				@ -6,11 +6,11 @@ ifdef CONFIG_TESTING_KERNEL
 | 
			
		||||
  KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
 | 
			
		||||
endif
 | 
			
		||||
 | 
			
		||||
LINUX_VERSION-4.9 = .190
 | 
			
		||||
LINUX_VERSION-4.9 = .191
 | 
			
		||||
LINUX_VERSION-4.14 = .141
 | 
			
		||||
LINUX_VERSION-4.19 = .69
 | 
			
		||||
 | 
			
		||||
LINUX_KERNEL_HASH-4.9.190 = fe8a1ca080a462de6832762ba8b71410b828f0e52c1e11d3c46d83e9ac1e0a16
 | 
			
		||||
LINUX_KERNEL_HASH-4.9.191 = ded4b87406deb67112b25a2283e8b5c89c2b47e2de14a97acda57f74cd38b7bc
 | 
			
		||||
LINUX_KERNEL_HASH-4.14.141 = 0bb9f0812326ec4554de1bea02628840e03b6664b5abfd9d8510049e43203a17
 | 
			
		||||
LINUX_KERNEL_HASH-4.19.69 = c091760b520a4e4a4c7034a8329cc2689a0ea3f81a377b694ed196d623e2d987
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -668,15 +668,15 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 | 
			
		||||
 
 | 
			
		||||
--- a/drivers/net/ethernet/hisilicon/hip04_eth.c
 | 
			
		||||
+++ b/drivers/net/ethernet/hisilicon/hip04_eth.c
 | 
			
		||||
@@ -555,7 +555,7 @@ refill:
 | 
			
		||||
@@ -559,7 +559,7 @@ refill:
 | 
			
		||||
 		priv->reg_inten |= RCV_INT;
 | 
			
		||||
 		writel_relaxed(priv->reg_inten, priv->base + PPE_INTEN);
 | 
			
		||||
 	}
 | 
			
		||||
-	napi_complete(napi);
 | 
			
		||||
+	napi_complete_done(napi, rx);
 | 
			
		||||
 done:
 | 
			
		||||
 	/* clean up tx descriptors and start a new timer if necessary */
 | 
			
		||||
 	tx_remaining = hip04_tx_reclaim(ndev, false);
 | 
			
		||||
 	/* start a new timer if necessary */
 | 
			
		||||
 	if (rx < budget && tx_remaining)
 | 
			
		||||
--- a/drivers/net/ethernet/hisilicon/hisi_femac.c
 | 
			
		||||
+++ b/drivers/net/ethernet/hisilicon/hisi_femac.c
 | 
			
		||||
@@ -330,7 +330,7 @@ static int hisi_femac_poll(struct napi_s
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user