net: Apply default format rules to all ethaddr

[people/ms/u-boot.git] / test / dm / eth.c

diff --git a/test/dm/eth.c b/test/dm/eth.c
index 4891f3ad34f7eb028fed60831c31e62a15520417..f31f6b322d7c64cf1725b1ac6a1caeb05e1e4ad8 100644 (file)
--- a/test/dm/eth.c
+++ b/test/dm/eth.c
@@ -89,6 +89,8 @@ static int dm_test_eth_rotate(struct dm_test_state *dms)
        /* Invalidate eth1's MAC address */
        net_ping_ip = string_to_ip("1.1.2.2");
        strcpy(ethaddr, getenv("eth1addr"));
+       /* Must disable access protection for eth1addr before clearing */
+       setenv(".flags", "eth1addr");
        setenv("eth1addr", NULL);
 
        /* Make sure that the default is to rotate to the next interface */
@@ -108,6 +110,7 @@ static int dm_test_eth_rotate(struct dm_test_state *dms)
 
        /* Invalidate eth0's MAC address */
        strcpy(ethaddr, getenv("ethaddr"));
+       /* Must disable access protection for ethaddr before clearing */
        setenv(".flags", "ethaddr");
        setenv("ethaddr", NULL);
 
@@ -135,6 +138,7 @@ static int dm_test_net_retry(struct dm_test_state *dms)
        sandbox_eth_disable_response(1, true);
        setenv("ethact", "eth@10004000");
        setenv("netretry", "yes");
+       sandbox_eth_skip_timeout();
        ut_assertok(net_loop(PING));
        ut_asserteq_str("eth@10002000", getenv("ethact"));
 
@@ -144,6 +148,7 @@ static int dm_test_net_retry(struct dm_test_state *dms)
         */
        setenv("ethact", "eth@10004000");
        setenv("netretry", "no");
+       sandbox_eth_skip_timeout();
        ut_asserteq(-ETIMEDOUT, net_loop(PING));
        ut_asserteq_str("eth@10004000", getenv("ethact"));