Commit bc0571fc authored by Joe Hershberger's avatar Joe Hershberger Committed by Simon Glass

net: cosmetic: Fix checkpatch.pl failures in net.c

Finish eliminating CamelCase from net.c and other failures
Signed-off-by: default avatarJoe Hershberger <joe.hershberger@ni.com>
Acked-by: default avatarSimon Glass <sjg@chromium.org>
parent a34f2075
......@@ -3340,9 +3340,9 @@ Legacy uImage format:
65 net/eth.c Ethernet found.
-80 common/cmd_net.c usage wrong
80 common/cmd_net.c before calling NetLoop()
-81 common/cmd_net.c some error in NetLoop() occurred
81 common/cmd_net.c NetLoop() back without error
80 common/cmd_net.c before calling net_loop()
-81 common/cmd_net.c some error in net_loop() occurred
81 common/cmd_net.c net_loop() back without error
-82 common/cmd_net.c size == 0 (File with size 0 loaded)
82 common/cmd_net.c trying automatic boot
83 common/cmd_net.c running "source" command
......
......@@ -170,7 +170,7 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
* Check to see if we need to tftp the image ourselves before starting
*/
if ((argc == 2) && (strcmp(argv[1], "tftp") == 0)) {
if (NetLoop(TFTPGET) <= 0)
if (net_loop(TFTPGET) <= 0)
return 1;
printf("Automatic boot of VxWorks image at address 0x%08lx ...\n",
addr);
......
......@@ -158,8 +158,8 @@ static void netboot_update_env(void)
setenv("domain", net_nis_domain);
#if defined(CONFIG_CMD_SNTP) && defined(CONFIG_BOOTP_TIMEOFFSET)
if (NetTimeOffset) {
sprintf(tmp, "%d", NetTimeOffset);
if (net_ntp_time_offset) {
sprintf(tmp, "%d", net_ntp_time_offset);
setenv("timeoffset", tmp);
}
#endif
......@@ -227,14 +227,14 @@ static int netboot_common(enum proto_t proto, cmd_tbl_t *cmdtp, int argc,
}
bootstage_mark(BOOTSTAGE_ID_NET_START);
size = NetLoop(proto);
size = net_loop(proto);
if (size < 0) {
bootstage_error(BOOTSTAGE_ID_NET_NETLOOP_OK);
return CMD_RET_FAILURE;
}
bootstage_mark(BOOTSTAGE_ID_NET_NETLOOP_OK);
/* NetLoop ok, update environment */
/* net_loop ok, update environment */
netboot_update_env();
/* done if no file was loaded (no errors though) */
......@@ -267,7 +267,7 @@ static int do_ping(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
if (net_ping_ip.s_addr == 0)
return CMD_RET_USAGE;
if (NetLoop(PING) < 0) {
if (net_loop(PING) < 0) {
printf("ping failed; host %s is not alive\n", argv[1]);
return CMD_RET_FAILURE;
}
......@@ -310,7 +310,7 @@ int do_cdp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
int r;
r = NetLoop(CDP);
r = net_loop(CDP);
if (r < 0) {
printf("cdp failed; perhaps not a CISCO switch?\n");
return CMD_RET_FAILURE;
......@@ -349,11 +349,11 @@ int do_sntp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
toff = getenv("timeoffset");
if (toff == NULL)
NetTimeOffset = 0;
net_ntp_time_offset = 0;
else
NetTimeOffset = simple_strtol(toff, NULL, 10);
net_ntp_time_offset = simple_strtol(toff, NULL, 10);
if (NetLoop(SNTP) < 0) {
if (net_loop(SNTP) < 0) {
printf("SNTP failed: host %pI4 not responding\n",
&net_ntp_server);
return CMD_RET_FAILURE;
......@@ -399,7 +399,7 @@ int do_dns(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
else
net_dns_env_var = NULL;
if (NetLoop(DNS) < 0) {
if (net_loop(DNS) < 0) {
printf("dns lookup of %s failed, check setup\n", argv[1]);
return CMD_RET_FAILURE;
}
......@@ -421,7 +421,7 @@ static int do_link_local(cmd_tbl_t *cmdtp, int flag, int argc,
{
char tmp[22];
if (NetLoop(LINKLOCAL) < 0)
if (net_loop(LINKLOCAL) < 0)
return CMD_RET_FAILURE;
net_gateway.s_addr = 0;
......
......@@ -28,7 +28,7 @@ void spl_net_load_image(const char *device)
}
if (device)
setenv("ethact", device);
rv = NetLoop(BOOTP);
rv = net_loop(BOOTP);
if (rv < 0) {
printf("Problem booting with BOOTP\n");
hang();
......
......@@ -70,7 +70,7 @@ static int update_load(char *filename, ulong msec_max, int cnt_max, ulong addr)
/* download the update file */
load_addr = addr;
copy_filename(net_boot_file_name, filename, sizeof(net_boot_file_name));
size = NetLoop(TFTPGET);
size = net_loop(TFTPGET);
if (size < 0)
rv = 1;
......
......@@ -32,11 +32,11 @@ after successful negotiation to enable network access.
-------------
RFC3927 requires that addresses are continuously checked to
avoid conflicts, however this can only happen when the NetLoop
avoid conflicts, however this can only happen when the net_loop
is getting called. It is possible for a conflict to go undetected
until a command that accesses the network is executed.
Using NetConsole is one way to ensure that NetLoop is always
Using NetConsole is one way to ensure that net_loop is always
processing packets and monitoring for conflicts.
This is also not a concern if the feature is use to connect
......
......@@ -113,7 +113,7 @@ static int refresh_settings_from_env(void)
}
/**
* Called from NetLoop in net/net.c before each packet
* Called from net_loop in net/net.c before each packet
*/
void nc_start(void)
{
......@@ -121,7 +121,7 @@ void nc_start(void)
if (!output_packet_len || memcmp(nc_ether, net_null_ethaddr, 6)) {
/* going to check for input packet */
net_set_udp_handler(nc_handler);
NetSetTimeout(net_timeout, nc_timeout_handler);
net_set_timeout_handler(net_timeout, nc_timeout_handler);
} else {
/* send arp request */
uchar *pkt;
......@@ -188,7 +188,7 @@ static void nc_send_packet(const char *buf, int len)
output_packet = buf;
output_packet_len = len;
input_recursion = 1;
NetLoop(NETCONS); /* wait for arp reply and send packet */
net_loop(NETCONS); /* wait for arp reply and send packet */
input_recursion = 0;
output_packet_len = 0;
return;
......@@ -232,7 +232,7 @@ static int nc_stdio_start(struct stdio_dev *dev)
/*
* Initialize the static IP settings and buffer pointers
* incase we call net_send_udp_packet before NetLoop
* incase we call net_send_udp_packet before net_loop
*/
net_init();
......@@ -277,7 +277,7 @@ static int nc_stdio_getc(struct stdio_dev *dev)
net_timeout = 0; /* no timeout */
while (!input_size)
NetLoop(NETCONS);
net_loop(NETCONS);
input_recursion = 0;
......@@ -307,7 +307,7 @@ static int nc_stdio_tstc(struct stdio_dev *dev)
input_recursion = 1;
net_timeout = 1;
NetLoop(NETCONS); /* kind of poll */
net_loop(NETCONS); /* kind of poll */
input_recursion = 0;
......
......@@ -485,7 +485,6 @@ extern uchar *net_tx_packet; /* THE transmit packet */
extern uchar *net_rx_packets[PKTBUFSRX]; /* Receive packets */
extern uchar *net_rx_packet; /* Current receive packet */
extern int net_rx_packet_len; /* Current rx packet length */
extern unsigned NetIPID; /* IP ID (counting) */
extern const u8 net_bcast_ethaddr[6]; /* Ethernet broadcast address */
extern const u8 net_null_ethaddr[6];
......@@ -494,7 +493,7 @@ extern const u8 net_null_ethaddr[6];
extern ushort net_our_vlan; /* Our VLAN */
extern ushort net_native_vlan; /* Our Native VLAN */
extern int NetRestartWrap; /* Tried all network devices */
extern int net_restart_wrap; /* Tried all network devices */
enum proto_t {
BOOTP, RARP, ARP, TFTPGET, DHCP, PING, DNS, NFS, CDP, NETCONS, SNTP,
......@@ -534,7 +533,7 @@ static inline int is_cdp_packet(const uchar *ethaddr)
#if defined(CONFIG_CMD_SNTP)
extern struct in_addr net_ntp_server; /* the ip address to NTP */
extern int NetTimeOffset; /* offset time from UTC */
extern int net_ntp_time_offset; /* offset time from UTC */
#endif
#if defined(CONFIG_MCAST_TFTP)
......@@ -543,13 +542,10 @@ extern struct in_addr net_mcast_addr;
/* Initialize the network adapter */
void net_init(void);
int NetLoop(enum proto_t);
/* Shutdown adapters and cleanup */
void NetStop(void);
int net_loop(enum proto_t);
/* Load failed. Start again. */
int NetStartAgain(void);
int net_start_again(void);
/* Get size of the ethernet header when we send */
int net_eth_hdr_size(void);
......@@ -599,7 +595,7 @@ void net_set_udp_handler(rxhand_f *); /* Set UDP RX packet handler */
rxhand_f *net_get_arp_handler(void); /* Get ARP RX packet handler */
void net_set_arp_handler(rxhand_f *); /* Set ARP RX packet handler */
void net_set_icmp_handler(rxhand_icmp_f *f); /* Set ICMP RX handler */
void NetSetTimeout(ulong, thand_f *);/* Set timeout handler */
void net_set_timeout_handler(ulong, thand_f *);/* Set timeout handler */
/* Network loop state */
enum net_loop_state {
......@@ -688,7 +684,7 @@ static inline struct in_addr net_read_ip(void *from)
}
/* return ulong *in network byteorder* */
static inline ulong NetReadLong(ulong *from)
static inline ulong net_read_long(ulong *from)
{
ulong l;
......@@ -709,7 +705,7 @@ static inline void net_copy_ip(void *to, void *from)
}
/* copy ulong */
static inline void NetCopyLong(ulong *to, ulong *from)
static inline void net_copy_long(ulong *to, ulong *from)
{
memcpy((void *)to, (void *)from, sizeof(ulong));
}
......
......@@ -112,7 +112,7 @@ void arp_timeout_check(void)
if (arp_wait_try >= ARP_TIMEOUT_COUNT) {
puts("\nARP Retry count exceeded; starting again\n");
arp_wait_try = 0;
NetStartAgain();
net_start_again();
} else {
arp_wait_timer_start = t;
arp_request();
......
......@@ -128,7 +128,7 @@ static int check_packet(uchar *pkt, unsigned dest, unsigned src, unsigned len)
retval = -4;
else if (bp->bp_hlen != HWL_ETHER)
retval = -5;
else if (!bootp_match_id(NetReadLong((ulong *)&bp->bp_id)))
else if (!bootp_match_id(net_read_long((ulong *)&bp->bp_id)))
retval = -6;
debug("Filtering pkt = %d\n", retval);
......@@ -356,10 +356,11 @@ static void bootp_handler(uchar *pkt, unsigned dest, struct in_addr sip,
store_net_params(bp); /* Store net parameters from reply */
/* Retrieve extended information (we must parse the vendor area) */
if (NetReadLong((ulong *)&bp->bp_vend[0]) == htonl(BOOTP_VENDOR_MAGIC))
if (net_read_long((ulong *)&bp->bp_vend[0]) ==
htonl(BOOTP_VENDOR_MAGIC))
bootp_process_vendor((uchar *)&bp->bp_vend[4], len);
NetSetTimeout(0, (thand_f *)0);
net_set_timeout_handler(0, (thand_f *)0);
bootstage_mark_name(BOOTSTAGE_ID_BOOTP_STOP, "bootp_stop");
debug("Got good BOOTP\n");
......@@ -381,13 +382,13 @@ static void bootp_timeout_handler(void)
net_set_state(NETLOOP_FAIL);
#else
puts("\nRetry time exceeded; starting again\n");
NetStartAgain();
net_start_again();
#endif
} else {
bootp_timeout *= 2;
if (bootp_timeout > 2000)
bootp_timeout = 2000;
NetSetTimeout(bootp_timeout, bootp_timeout_handler);
net_set_timeout_handler(bootp_timeout, bootp_timeout_handler);
bootp_request();
}
}
......@@ -740,7 +741,7 @@ void bootp_request(void)
bootp_id += get_timer(0);
bootp_id = htonl(bootp_id);
bootp_add_id(bootp_id);
NetCopyLong(&bp->bp_id, &bootp_id);
net_copy_long(&bp->bp_id, &bootp_id);
/*
* Calculate proper packet lengths taking into account the
......@@ -750,7 +751,7 @@ void bootp_request(void)
pktlen = eth_hdr_size + IP_UDP_HDR_SIZE + iplen;
bcast_ip.s_addr = 0xFFFFFFFFL;
net_set_udp_header(iphdr, bcast_ip, PORT_BOOTPS, PORT_BOOTPC, iplen);
NetSetTimeout(bootp_timeout, bootp_timeout_handler);
net_set_timeout_handler(bootp_timeout, bootp_timeout_handler);
#if defined(CONFIG_CMD_DHCP)
dhcp_state = SELECTING;
......@@ -778,9 +779,9 @@ static void dhcp_process_options(uchar *popt, struct bootp_hdr *bp)
break;
#if defined(CONFIG_CMD_SNTP) && defined(CONFIG_BOOTP_TIMEOFFSET)
case 2: /* Time offset */
to_ptr = &NetTimeOffset;
NetCopyLong((ulong *)to_ptr, (ulong *)(popt + 2));
NetTimeOffset = ntohl(NetTimeOffset);
to_ptr = &net_ntp_time_offset;
net_copy_long((ulong *)to_ptr, (ulong *)(popt + 2));
net_ntp_time_offset = ntohl(net_ntp_time_offset);
break;
#endif
case 3:
......@@ -815,7 +816,7 @@ static void dhcp_process_options(uchar *popt, struct bootp_hdr *bp)
break;
#endif
case 51:
NetCopyLong(&dhcp_leasetime, (ulong *) (popt + 2));
net_copy_long(&dhcp_leasetime, (ulong *)(popt + 2));
break;
case 53: /* Ignore Message Type Option */
break;
......@@ -869,7 +870,7 @@ static void dhcp_process_options(uchar *popt, struct bootp_hdr *bp)
static int dhcp_message_type(unsigned char *popt)
{
if (NetReadLong((ulong *)popt) != htonl(BOOTP_VENDOR_MAGIC))
if (net_read_long((ulong *)popt) != htonl(BOOTP_VENDOR_MAGIC))
return -1;
popt += 4;
......@@ -923,7 +924,7 @@ static void dhcp_send_request_packet(struct bootp_hdr *bp_offer)
* ID is the id of the OFFER packet
*/
NetCopyLong(&bp->bp_id, &bp_offer->bp_id);
net_copy_long(&bp->bp_id, &bp_offer->bp_id);
/*
* Copy options from OFFER packet if present
......@@ -982,11 +983,11 @@ static void dhcp_handler(uchar *pkt, unsigned dest, struct in_addr sip,
debug("TRANSITIONING TO REQUESTING STATE\n");
dhcp_state = REQUESTING;
if (NetReadLong((ulong *)&bp->bp_vend[0]) ==
if (net_read_long((ulong *)&bp->bp_vend[0]) ==
htonl(BOOTP_VENDOR_MAGIC))
dhcp_process_options((u8 *)&bp->bp_vend[4], bp);
NetSetTimeout(5000, bootp_timeout_handler);
net_set_timeout_handler(5000, bootp_timeout_handler);
dhcp_send_request_packet(bp);
#ifdef CONFIG_SYS_BOOTFILE_PREFIX
}
......@@ -998,7 +999,7 @@ static void dhcp_handler(uchar *pkt, unsigned dest, struct in_addr sip,
debug("DHCP State: REQUESTING\n");
if (dhcp_message_type((u8 *)bp->bp_vend) == DHCP_ACK) {
if (NetReadLong((ulong *)&bp->bp_vend[0]) ==
if (net_read_long((ulong *)&bp->bp_vend[0]) ==
htonl(BOOTP_VENDOR_MAGIC))
dhcp_process_options((u8 *)&bp->bp_vend[4], bp);
/* Store net params from reply */
......
......@@ -224,14 +224,14 @@ static void cdp_timeout_handler(void)
cdp_seq++;
if (cdp_seq < 3) {
NetSetTimeout(CDP_TIMEOUT, cdp_timeout_handler);
net_set_timeout_handler(CDP_TIMEOUT, cdp_timeout_handler);
cdp_send_trigger();
return;
}
/* if not OK try again */
if (!cdp_ok)
NetStartAgain();
net_start_again();
else
net_set_state(NETLOOP_SUCCESS);
}
......@@ -357,7 +357,7 @@ void cdp_start(void)
cdp_native_vlan = htons(-1);
cdp_appliance_vlan = htons(-1);
NetSetTimeout(CDP_TIMEOUT, cdp_timeout_handler);
net_set_timeout_handler(CDP_TIMEOUT, cdp_timeout_handler);
cdp_send_trigger();
}
......@@ -197,7 +197,7 @@ void dns_start(void)
{
debug("%s\n", __func__);
NetSetTimeout(DNS_TIMEOUT, dns_timeout_handler);
net_set_timeout_handler(DNS_TIMEOUT, dns_timeout_handler);
net_set_udp_handler(dns_handler);
/* Clear a previous MAC address, the server IP might have changed. */
......
......@@ -965,7 +965,7 @@ void eth_try_another(int first_restart)
eth_current_changed();
if (first_failed == eth_get_dev())
NetRestartWrap = 1;
net_restart_wrap = 1;
}
void eth_set_current(void)
......
......@@ -99,7 +99,7 @@ static void configure_wait(void)
debug_cond(DEBUG_DEV_PKT, "...wait %d %s nprobes=%u, nclaims=%u\n",
timeout_ms, eth_get_name(), nprobes, nclaims);
NetSetTimeout(timeout_ms, link_local_timeout);
net_set_timeout_handler(timeout_ms, link_local_timeout);
}
void link_local_start(void)
......@@ -182,7 +182,7 @@ static void link_local_timeout(void)
conflicts = 0;
timeout_ms = -1;
/* Never timeout in the monitor state */
NetSetTimeout(0, NULL);
net_set_timeout_handler(0, NULL);
/* NOTE: all other exit paths should deconfig ... */
net_set_state(NETLOOP_SUCCESS);
......
This diff is collapsed.
......@@ -571,11 +571,12 @@ static void nfs_timeout_handler(void)
{
if (++nfs_timeout_count > NFS_RETRY_COUNT) {
puts("\nRetry count exceeded; starting again\n");
NetStartAgain();
net_start_again();
} else {
puts("T ");
NetSetTimeout(nfs_timeout + NFS_TIMEOUT * nfs_timeout_count,
nfs_timeout_handler);
net_set_timeout_handler(nfs_timeout +
NFS_TIMEOUT * nfs_timeout_count,
nfs_timeout_handler);
nfs_send();
}
}
......@@ -670,7 +671,7 @@ static void nfs_handler(uchar *pkt, unsigned dest, struct in_addr sip,
case STATE_READ_REQ:
rlen = nfs_read_reply(pkt, len);
NetSetTimeout(nfs_timeout, nfs_timeout_handler);
net_set_timeout_handler(nfs_timeout, nfs_timeout_handler);
if (rlen > 0) {
nfs_offset += rlen;
nfs_send();
......@@ -756,7 +757,7 @@ void nfs_start(void)
printf("\nLoad address: 0x%lx\n"
"Loading: *\b", load_addr);
NetSetTimeout(nfs_timeout, nfs_timeout_handler);
net_set_timeout_handler(nfs_timeout, nfs_timeout_handler);
net_set_udp_handler(nfs_handler);
nfs_timeout_count = 0;
......
......@@ -74,7 +74,7 @@ static void ping_timeout_handler(void)
void ping_start(void)
{
printf("Using %s device\n", eth_get_name());
NetSetTimeout(10000UL, ping_timeout_handler);
net_set_timeout_handler(10000UL, ping_timeout_handler);
ping_send();
}
......
......@@ -59,9 +59,9 @@ static void rarp_timeout_handler(void)
{
if (rarp_try >= TIMEOUT_COUNT) {
puts("\nRetry count exceeded; starting again\n");
NetStartAgain();
net_start_again();
} else {
NetSetTimeout(TIMEOUT, rarp_timeout_handler);
net_set_timeout_handler(TIMEOUT, rarp_timeout_handler);
rarp_request();
}
}
......@@ -95,5 +95,5 @@ void rarp_request(void)
net_send_packet(net_tx_packet, eth_hdr_size + ARP_HDR_SIZE);
NetSetTimeout(TIMEOUT, rarp_timeout_handler);
net_set_timeout_handler(TIMEOUT, rarp_timeout_handler);
}
......@@ -65,7 +65,7 @@ static void sntp_handler(uchar *pkt, unsigned dest, struct in_addr sip,
*/
memcpy(&seconds, &rpktp->transmit_timestamp, sizeof(ulong));
to_tm(ntohl(seconds) - 2208988800UL + NetTimeOffset, &tm);
to_tm(ntohl(seconds) - 2208988800UL + net_ntp_time_offset, &tm);
#if defined(CONFIG_CMD_DATE)
rtc_set(&tm);
#endif
......@@ -80,7 +80,7 @@ void sntp_start(void)
{
debug("%s\n", __func__);
NetSetTimeout(SNTP_TIMEOUT, sntp_timeout_handler);
net_set_timeout_handler(SNTP_TIMEOUT, sntp_timeout_handler);
net_set_udp_handler(sntp_handler);
memset(net_server_ethaddr, 0, sizeof(net_server_ethaddr));
......
......@@ -275,7 +275,7 @@ static void restart(const char *msg)
#ifdef CONFIG_MCAST_TFTP
mcast_cleanup();
#endif
NetStartAgain();
net_start_again();
}
/*
......@@ -589,7 +589,7 @@ static void tftp_handler(uchar *pkt, unsigned dest, struct in_addr sip,
printf("First block is not block 1 (%ld)\n",
tftp_cur_block);
puts("Starting again\n\n");
NetStartAgain();
net_start_again();
break;
}
}
......@@ -601,7 +601,7 @@ static void tftp_handler(uchar *pkt, unsigned dest, struct in_addr sip,
tftp_prev_block = tftp_cur_block;
timeout_count_max = TIMEOUT_COUNT;
NetSetTimeout(timeout_ms, tftp_timeout_handler);
net_set_timeout_handler(timeout_ms, tftp_timeout_handler);
store_block(tftp_cur_block - 1, pkt + 2, len);
......@@ -628,7 +628,7 @@ static void tftp_handler(uchar *pkt, unsigned dest, struct in_addr sip,
/* try to double it and retry */
tftp_mcast_bitmap_size <<= 1;
mcast_cleanup();
NetStartAgain();
net_start_again();
return;
}
tftp_prev_block = tftp_cur_block;
......@@ -672,7 +672,7 @@ static void tftp_handler(uchar *pkt, unsigned dest, struct in_addr sip,
#ifdef CONFIG_MCAST_TFTP
mcast_cleanup();
#endif
NetStartAgain();
net_start_again();
break;
}
break;
......@@ -686,7 +686,7 @@ static void tftp_timeout_handler(void)
restart("Retry count exceeded");
} else {
puts("T ");
NetSetTimeout(timeout_ms, tftp_timeout_handler);
net_set_timeout_handler(timeout_ms, tftp_timeout_handler);
if (tftp_state != STATE_RECV_WRQ)
tftp_send();
}
......@@ -794,7 +794,7 @@ void tftp_start(enum proto_t protocol)
time_start = get_timer(0);
timeout_count_max = tftp_timeout_count_max;
NetSetTimeout(timeout_ms, tftp_timeout_handler);
net_set_timeout_handler(timeout_ms, tftp_timeout_handler);
net_set_udp_handler(tftp_handler);
#ifdef CONFIG_CMD_TFTPPUT
net_set_icmp_handler(icmp_handler);
......@@ -843,7 +843,7 @@ void tftp_start_server(void)
timeout_count_max = TIMEOUT_COUNT;
timeout_count = 0;
timeout_ms = TIMEOUT;
NetSetTimeout(timeout_ms, tftp_timeout_handler);
net_set_timeout_handler(timeout_ms, tftp_timeout_handler);
/* Revert tftp_block_size to dflt */
tftp_block_size = TFTP_BLOCK_SIZE;
......@@ -951,7 +951,7 @@ static void parse_multicast_oack(char *pkt, int len)
printf("Fail to set mcast, revert to TFTP\n");
tftp_mcast_disabled = 1;
mcast_cleanup();
NetStartAgain();
net_start_again();
}
}
tftp_mcast_master_client = simple_strtoul((char *)mc, NULL, 10);
......
......@@ -23,15 +23,15 @@ static int dm_test_eth(struct dm_test_state *dms)
net_ping_ip = string_to_ip("1.1.2.2");
setenv("ethact", "eth@10002000");
ut_assertok(NetLoop(PING));
ut_assertok(net_loop(PING));
ut_asserteq_str("eth@10002000", getenv("ethact"));
setenv("ethact", "eth@10003000");
ut_assertok(NetLoop(PING));
ut_assertok(net_loop(PING));
ut_asserteq_str("eth@10003000", getenv("ethact"));
setenv("ethact", "eth@10004000");
ut_assertok(NetLoop(PING));
ut_assertok(net_loop(PING));
ut_asserteq_str("eth@10004000", getenv("ethact"));
return 0;
......@@ -42,20 +42,20 @@ static int dm_test_eth_alias(struct dm_test_state *dms)
{
net_ping_ip = string_to_ip("1.1.2.2");
setenv("ethact", "eth0");
ut_assertok(NetLoop(PING));
ut_assertok(net_loop(PING));
ut_asserteq_str("eth@10002000", getenv("ethact"));
setenv("ethact", "eth1");
ut_assertok(NetLoop(PING));
ut_assertok(net_loop(PING));
ut_asserteq_str("eth@10004000", getenv("ethact"));
/* Expected to fail since eth2 is not defined in the device tree */
setenv("ethact", "eth2");
ut_assertok(NetLoop(PING));
ut_assertok(net_loop(PING));
ut_asserteq_str("eth@10002000", getenv("ethact"));
setenv("ethact", "eth5");
ut_assertok(NetLoop(PING));
ut_assertok(net_loop(PING));
ut_asserteq_str("eth@10003000", getenv("ethact"));
return 0;
......@@ -69,13 +69,13 @@ static int dm_test_eth_prime(struct dm_test_state *dms)
/* Expected to be "eth@10003000" because of ethprime variable */
setenv("ethact", NULL);
setenv("ethprime", "eth5");
ut_assertok(NetLoop(PING));
ut_assertok(net_loop(PING));
ut_asserteq_str("eth@10003000", getenv("ethact"));
/* Expected to be "eth@10002000" because it is first */
setenv("ethact", NULL);
setenv("ethprime", NULL);
ut_assertok(NetLoop(PING));
ut_assertok(net_loop(PING));
ut_asserteq_str("eth@10002000", getenv("ethact"));
return 0;
......@@ -93,13 +93,13 @@ static int dm_test_eth_rotate(struct dm_test_state *dms)
/* Make sure that the default is to rotate to the next interface */
setenv("ethact", "eth@10004000");
ut_assertok(NetLoop(PING));
ut_assertok(net_loop(PING));
ut_asserteq_str("eth@10002000", getenv("ethact"));
/* If ethrotate is no, then we should fail on a bad MAC */
setenv("ethact", "eth@10004000");
setenv("ethrotate", "no");
ut_asserteq(-EINVAL, NetLoop(PING));
ut_asserteq(-EINVAL, net_loop(PING));
ut_asserteq_str("eth@10004000", getenv("ethact"));
/* Restore the env */
......@@ -113,7 +113,7 @@ static int dm_test_eth_rotate(struct dm_test_state *dms)
/* Make sure we can skip invalid devices */
setenv("ethact", "eth@10004000");
ut_assertok(NetLoop(PING));
ut_assertok(net_loop(PING));
ut_asserteq_str("eth@10004000", getenv("ethact"));
/* Restore the env */
......@@ -135,7 +135,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");
ut_assertok(NetLoop(PING));
ut_assertok(net_loop(PING));
ut_asserteq_str("eth@10002000", getenv("ethact"));
/*
......@@ -144,7 +144,7 @@ static int dm_test_net_retry(struct dm_test_state *dms)
*/
setenv("ethact", "eth@10004000");
setenv("netretry", "no");
ut_asserteq(-ETIMEDOUT, NetLoop(PING));
ut_asserteq(-ETIMEDOUT, net_loop(PING));
ut_asserteq_str("eth@10004000", getenv("ethact"));
/* Restore the env */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment