forked from pool/u-boot
40 lines
1.2 KiB
Diff
40 lines
1.2 KiB
Diff
|
From 18d741c98c7fdeca3c8ed1df40bd35fbebaa8571 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Alexander Graf <agraf@suse.de>
|
||
|
|
Date: Thu, 15 Mar 2018 11:02:33 +0100
|
||
|
|
Subject: [PATCH] net: Only access network devices after init
|
||
|
|
|
||
|
|
In the efi_loader main loop we call eth_rx() occasionally. This rx function
|
||
|
|
might end up calling into devices that haven't been initialized yet,
|
||
|
|
potentially resulting in a lot of transfer timeouts.
|
||
|
|
|
||
|
|
Instead, let's make sure the ethernet device is actually initialized before
|
||
|
|
reading from or writing to it.
|
||
|
|
|
||
|
|
Signed-off-by: Alexander Graf <agraf@suse.de>
|
||
|
|
---
|
||
|
|
net/eth-uclass.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/net/eth-uclass.c b/net/eth-uclass.c
|
||
|
|
index d30b04ba86..240b596534 100644
|
||
|
|
--- a/net/eth-uclass.c
|
||
|
|
+++ b/net/eth-uclass.c
|
||
|
|
@@ -336,7 +336,7 @@ int eth_send(void *packet, int length)
|
||
|
|
if (!current)
|
||
|
|
return -ENODEV;
|
||
|
|
|
||
|
|
- if (!device_active(current))
|
||
|
|
+ if (!eth_is_active(current))
|
||
|
|
return -EINVAL;
|
||
|
|
|
||
|
|
ret = eth_get_ops(current)->send(current, packet, length);
|
||
|
|
@@ -359,7 +359,7 @@ int eth_rx(void)
|
||
|
|
if (!current)
|
||
|
|
return -ENODEV;
|
||
|
|
|
||
|
|
- if (!device_active(current))
|
||
|
|
+ if (!eth_is_active(current))
|
||
|
|
return -EINVAL;
|
||
|
|
|
||
|
|
/* Process up to 32 packets at one time */
|