summaryrefslogtreecommitdiff
path: root/drivers/staging/octeon
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@iki.fi>2016-08-31 23:57:46 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-09-02 14:46:53 +0200
commitd48f10fc616a82c8e761753fd6edf6b6f6b66bec (patch)
tree524d67e618cb8537415cf189d0718f663be20c31 /drivers/staging/octeon
parentce060d8af33c0dee3c20510a39f6284f8d90614e (diff)
staging: octeon: prevent poll during rx init
Prevent poll before the RX init has been completed. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/octeon')
-rw-r--r--drivers/staging/octeon/ethernet-rx.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
index 4f32fa37d5de..ce1e2a321abb 100644
--- a/drivers/staging/octeon/ethernet-rx.c
+++ b/drivers/staging/octeon/ethernet-rx.c
@@ -43,6 +43,8 @@
#include <asm/octeon/cvmx-gmxx-defs.h>
+static atomic_t oct_rx_ready = ATOMIC_INIT(0);
+
static struct oct_rx_group {
int irq;
int group;
@@ -444,6 +446,9 @@ void cvm_oct_poll_controller(struct net_device *dev)
{
int i;
+ if (!atomic_read(&oct_rx_ready))
+ return;
+
for (i = 0; i < ARRAY_SIZE(oct_rx_group); i++) {
if (!(pow_receive_groups & BIT(i)))
@@ -524,6 +529,7 @@ void cvm_oct_rx_initialize(void)
*/
napi_schedule(&oct_rx_group[i].napi);
}
+ atomic_inc(&oct_rx_ready);
}
void cvm_oct_rx_shutdown(void)