diff options
| author | Joe Hershberger <joe.hershberger@ni.com> | 2018-09-26 16:48:53 -0500 |
|---|---|---|
| committer | Joe Hershberger <joe.hershberger@ni.com> | 2018-10-10 12:28:56 -0500 |
| commit | e4ab9a65081f032495533af7474d52ff17dd5d27 (patch) | |
| tree | 4dc3f3af241eb59d0910aba5bcc4f869409c459b /drivers | |
| parent | 5b7239860830dab2ed47814875729f06109725df (diff) | |
net: sandbox: Move disabled flag into priv struct
Store the per-device data with the device.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/sandbox.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/drivers/net/sandbox.c b/drivers/net/sandbox.c index b71c8f88d9..60fe065ee5 100644 --- a/drivers/net/sandbox.c +++ b/drivers/net/sandbox.c @@ -19,17 +19,18 @@ DECLARE_GLOBAL_DATA_PTR; * * fake_host_hwaddr: MAC address of mocked machine * fake_host_ipaddr: IP address of mocked machine + * disabled: Will not respond * recv_packet_buffer: buffer of the packet returned as received * recv_packet_length: length of the packet returned as received */ struct eth_sandbox_priv { uchar fake_host_hwaddr[ARP_HLEN]; struct in_addr fake_host_ipaddr; + bool disabled; uchar *recv_packet_buffer; int recv_packet_length; }; -static bool disabled[8] = {false}; static bool skip_timeout; /* @@ -40,7 +41,16 @@ static bool skip_timeout; */ void sandbox_eth_disable_response(int index, bool disable) { - disabled[index] = disable; + struct udevice *dev; + struct eth_sandbox_priv *priv; + int ret; + + ret = uclass_get_device(UCLASS_ETH, index, &dev); + if (ret) + return; + + priv = dev_get_priv(dev); + priv->disabled = disable; } /* @@ -71,8 +81,7 @@ static int sb_eth_send(struct udevice *dev, void *packet, int length) debug("eth_sandbox: Send packet %d\n", length); - if (dev->seq >= 0 && dev->seq < ARRAY_SIZE(disabled) && - disabled[dev->seq]) + if (priv->disabled) return 0; if (ntohs(eth->et_protlen) == PROT_ARP) { @@ -212,6 +221,7 @@ static int sb_eth_ofdata_to_platdata(struct udevice *dev) return -EINVAL; } memcpy(priv->fake_host_hwaddr, mac, ARP_HLEN); + priv->disabled = false; return 0; } |