Просмотр исходного кода

amd-xgbe: Change from napi_complete to napi_complete_done

Change from using napi_complete to napi_complete_done to allow for the
use of gro_flush_timeout in tuning network processing.

Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Lendacky, Thomas 9 лет назад
Родитель
Сommit
491aefb38a
1 измененных файлов с 4 добавлено и 4 удалено
  1. 4 4
      drivers/net/ethernet/amd/xgbe/xgbe-drv.c

+ 4 - 4
drivers/net/ethernet/amd/xgbe/xgbe-drv.c

@@ -6,7 +6,7 @@
  *
  *
  * License 1: GPLv2
  * License 1: GPLv2
  *
  *
- * Copyright (c) 2014 Advanced Micro Devices, Inc.
+ * Copyright (c) 2014-2016 Advanced Micro Devices, Inc.
  *
  *
  * This file is free software; you may copy, redistribute and/or modify
  * This file is free software; you may copy, redistribute and/or modify
  * it under the terms of the GNU General Public License as published by
  * it under the terms of the GNU General Public License as published by
@@ -56,7 +56,7 @@
  *
  *
  * License 2: Modified BSD
  * License 2: Modified BSD
  *
  *
- * Copyright (c) 2014 Advanced Micro Devices, Inc.
+ * Copyright (c) 2014-2016 Advanced Micro Devices, Inc.
  * All rights reserved.
  * All rights reserved.
  *
  *
  * Redistribution and use in source and binary forms, with or without
  * Redistribution and use in source and binary forms, with or without
@@ -2068,7 +2068,7 @@ static int xgbe_one_poll(struct napi_struct *napi, int budget)
 	/* If we processed everything, we are done */
 	/* If we processed everything, we are done */
 	if (processed < budget) {
 	if (processed < budget) {
 		/* Turn off polling */
 		/* Turn off polling */
-		napi_complete(napi);
+		napi_complete_done(napi, processed);
 
 
 		/* Enable Tx and Rx interrupts */
 		/* Enable Tx and Rx interrupts */
 		enable_irq(channel->dma_irq);
 		enable_irq(channel->dma_irq);
@@ -2110,7 +2110,7 @@ static int xgbe_all_poll(struct napi_struct *napi, int budget)
 	/* If we processed everything, we are done */
 	/* If we processed everything, we are done */
 	if (processed < budget) {
 	if (processed < budget) {
 		/* Turn off polling */
 		/* Turn off polling */
-		napi_complete(napi);
+		napi_complete_done(napi, processed);
 
 
 		/* Enable Tx and Rx interrupts */
 		/* Enable Tx and Rx interrupts */
 		xgbe_enable_rx_tx_ints(pdata);
 		xgbe_enable_rx_tx_ints(pdata);