summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Rostedt (Red Hat) <rostedt@goodmis.org>2014-04-30 18:28:22 (GMT)
committerScott Wood <scottwood@freescale.com>2014-05-14 18:39:01 (GMT)
commitd4df6537f46c62c610e2e47301af6c354416020c (patch)
treedbaf500a0a1fd537055aebf03a544f56eca33e42
parent61b4dcfedfffa3f36c3fd76fb414c67b5e3c960d (diff)
downloadlinux-fsl-qoriq-d4df6537f46c62c610e2e47301af6c354416020c.tar.xz
net: gianfar: Fix missing return of gfar_clean_tx_ring()
The patch "net: gianfar: do not try to cleanup TX packets if they are not done" for 3.12-rt left out the return value for gfar_clean_tx_ring(). This would cause an error when building this module. Note, this module does not build on x86 and was not tested because of that. Reported-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-rw-r--r--drivers/net/ethernet/freescale/gianfar.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
index 091945c..df27493 100644
--- a/drivers/net/ethernet/freescale/gianfar.c
+++ b/drivers/net/ethernet/freescale/gianfar.c
@@ -2615,6 +2615,7 @@ static int gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue)
tx_queue->dirty_tx = bdp;
netdev_tx_completed_queue(txq, howmany, bytes_sent);
+ return howmany;
}
static void gfar_schedule_cleanup(struct gfar_priv_grp *gfargrp)