From: Sascha Hauer <[email protected]> Add ethernet code safe for being called from a poller.
Signed-off-by: Sascha Hauer <[email protected]> --- include/net.h | 8 ++++++++ net/eth.c | 21 ++++++++++++++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/include/net.h b/include/net.h index 54db8a179..8d2b4923d 100644 --- a/include/net.h +++ b/include/net.h @@ -19,6 +19,7 @@ #include <stdlib.h> #include <clock.h> #include <led.h> +#include <slice.h> #include <xfuncs.h> #include <linux/phy.h> #include <linux/string.h> /* memcpy */ @@ -63,6 +64,8 @@ struct eth_device { char *bootarg; char *linuxdevname; + struct slice slice; + bool ifup; #define ETH_MODE_DHCP 0 #define ETH_MODE_STATIC 1 @@ -72,6 +75,11 @@ struct eth_device { #define dev_to_edev(d) container_of(d, struct eth_device, dev) +static inline struct slice *eth_device_slice(struct eth_device *edev) +{ + return &edev->slice; +} + static inline const char *eth_name(struct eth_device *edev) { return edev->devname; diff --git a/net/eth.c b/net/eth.c index e3d0d06ef..2df0a74a5 100644 --- a/net/eth.c +++ b/net/eth.c @@ -219,20 +219,32 @@ int eth_send(struct eth_device *edev, void *packet, int length) if (ret) return ret; + slice_acquire(eth_device_slice(edev)); + led_trigger_network(LED_TRIGGER_NET_TX); - return edev->send(edev, packet, length); + ret = edev->send(edev, packet, length); + + slice_release(eth_device_slice(edev)); + + return ret; } static int __eth_rx(struct eth_device *edev) { int ret; + slice_acquire(eth_device_slice(edev)); + ret = eth_carrier_check(edev, 0); if (ret) - return ret; + goto out; + + ret = edev->recv(edev); +out: + slice_release(eth_device_slice(edev)); - return edev->recv(edev); + return ret; } int eth_rx(void) @@ -353,6 +365,8 @@ int eth_register(struct eth_device *edev) if (ret) return ret; + slice_init(&edev->slice, dev_name(dev)); + edev->devname = xstrdup(dev_name(&edev->dev)); dev_add_param_ip(dev, "ipaddr", NULL, NULL, &edev->ipaddr, edev); @@ -431,6 +445,7 @@ void eth_unregister(struct eth_device *edev) free(edev->devname); unregister_device(&edev->dev); + slice_exit(&edev->slice); list_del(&edev->list); } -- 2.17.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
