diff options
author | Alan Ott <alan@signal11.us> | 2013-10-05 23:52:22 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-10-08 15:32:13 -0400 |
commit | 9757f1d2e0b4e7ff59e76c2fadbf819e18f3f884 (patch) | |
tree | a279cc4966286b7ee5a9ac5775e3a9747da66936 /drivers/net/ieee802154 | |
parent | 8cc27d174b6502a4a9dc6186f35bf1351a6e200e (diff) |
mrf24j40: Move INIT_COMPLETION() to before packet transmission
This avoids a race condition where complete(tx_complete) could be called
before tx_complete is initialized.
Signed-off-by: Alan Ott <alan@signal11.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ieee802154')
-rw-r--r-- | drivers/net/ieee802154/mrf24j40.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c index 42e6deee6db5..66bb4ceaabe8 100644 --- a/drivers/net/ieee802154/mrf24j40.c +++ b/drivers/net/ieee802154/mrf24j40.c | |||
@@ -344,6 +344,8 @@ static int mrf24j40_tx(struct ieee802154_dev *dev, struct sk_buff *skb) | |||
344 | if (ret) | 344 | if (ret) |
345 | goto err; | 345 | goto err; |
346 | 346 | ||
347 | INIT_COMPLETION(devrec->tx_complete); | ||
348 | |||
347 | /* Set TXNTRIG bit of TXNCON to send packet */ | 349 | /* Set TXNTRIG bit of TXNCON to send packet */ |
348 | ret = read_short_reg(devrec, REG_TXNCON, &val); | 350 | ret = read_short_reg(devrec, REG_TXNCON, &val); |
349 | if (ret) | 351 | if (ret) |
@@ -354,8 +356,6 @@ static int mrf24j40_tx(struct ieee802154_dev *dev, struct sk_buff *skb) | |||
354 | val |= 0x4; | 356 | val |= 0x4; |
355 | write_short_reg(devrec, REG_TXNCON, val); | 357 | write_short_reg(devrec, REG_TXNCON, val); |
356 | 358 | ||
357 | INIT_COMPLETION(devrec->tx_complete); | ||
358 | |||
359 | /* Wait for the device to send the TX complete interrupt. */ | 359 | /* Wait for the device to send the TX complete interrupt. */ |
360 | ret = wait_for_completion_interruptible_timeout( | 360 | ret = wait_for_completion_interruptible_timeout( |
361 | &devrec->tx_complete, | 361 | &devrec->tx_complete, |