Commit d48f10fc authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman

staging: octeon: prevent poll during rx init

Prevent poll before the RX init has been completed.
Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ce060d8a
...@@ -43,6 +43,8 @@ ...@@ -43,6 +43,8 @@
#include <asm/octeon/cvmx-gmxx-defs.h> #include <asm/octeon/cvmx-gmxx-defs.h>
static atomic_t oct_rx_ready = ATOMIC_INIT(0);
static struct oct_rx_group { static struct oct_rx_group {
int irq; int irq;
int group; int group;
...@@ -444,6 +446,9 @@ void cvm_oct_poll_controller(struct net_device *dev) ...@@ -444,6 +446,9 @@ void cvm_oct_poll_controller(struct net_device *dev)
{ {
int i; int i;
if (!atomic_read(&oct_rx_ready))
return;
for (i = 0; i < ARRAY_SIZE(oct_rx_group); i++) { for (i = 0; i < ARRAY_SIZE(oct_rx_group); i++) {
if (!(pow_receive_groups & BIT(i))) if (!(pow_receive_groups & BIT(i)))
...@@ -524,6 +529,7 @@ void cvm_oct_rx_initialize(void) ...@@ -524,6 +529,7 @@ void cvm_oct_rx_initialize(void)
*/ */
napi_schedule(&oct_rx_group[i].napi); napi_schedule(&oct_rx_group[i].napi);
} }
atomic_inc(&oct_rx_ready);
} }
void cvm_oct_rx_shutdown(void) void cvm_oct_rx_shutdown(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment