return is not a function
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
parent
9296260a78
commit
c227c646e3
22
net/net.c
22
net/net.c
|
@ -388,7 +388,7 @@ int NetLoop(proto_t protocol)
|
||||||
if (ctrlc()) {
|
if (ctrlc()) {
|
||||||
eth_halt();
|
eth_halt();
|
||||||
puts ("\nAbort\n");
|
puts ("\nAbort\n");
|
||||||
return (-1);
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
ArpTimeoutCheck();
|
ArpTimeoutCheck();
|
||||||
|
@ -420,7 +420,7 @@ int NetLoop(proto_t protocol)
|
||||||
|
|
||||||
case NETLOOP_FAIL:
|
case NETLOOP_FAIL:
|
||||||
eth_halt();
|
eth_halt();
|
||||||
return (-1);
|
return -1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -859,7 +859,7 @@ static int net_check_prereq (proto_t protocol)
|
||||||
case PING:
|
case PING:
|
||||||
if (NetPingIP == 0) {
|
if (NetPingIP == 0) {
|
||||||
puts ("*** ERROR: ping address not given\n");
|
puts ("*** ERROR: ping address not given\n");
|
||||||
return (1);
|
return 1;
|
||||||
}
|
}
|
||||||
goto common;
|
goto common;
|
||||||
#endif
|
#endif
|
||||||
|
@ -867,7 +867,7 @@ static int net_check_prereq (proto_t protocol)
|
||||||
case SNTP:
|
case SNTP:
|
||||||
if (NetNtpServerIP == 0) {
|
if (NetNtpServerIP == 0) {
|
||||||
puts ("*** ERROR: NTP server address not given\n");
|
puts ("*** ERROR: NTP server address not given\n");
|
||||||
return (1);
|
return 1;
|
||||||
}
|
}
|
||||||
goto common;
|
goto common;
|
||||||
#endif
|
#endif
|
||||||
|
@ -878,13 +878,13 @@ static int net_check_prereq (proto_t protocol)
|
||||||
case TFTP:
|
case TFTP:
|
||||||
if (NetServerIP == 0) {
|
if (NetServerIP == 0) {
|
||||||
printf("*** ERROR: `%s.serverip' not set\n", dev_id(&edev->dev));
|
printf("*** ERROR: `%s.serverip' not set\n", dev_id(&edev->dev));
|
||||||
return (1);
|
return 1;
|
||||||
}
|
}
|
||||||
common:
|
common:
|
||||||
|
|
||||||
if (NetOurIP == 0) {
|
if (NetOurIP == 0) {
|
||||||
printf("*** ERROR: `%s.ipaddr' not set\n", dev_id(&edev->dev));
|
printf("*** ERROR: `%s.ipaddr' not set\n", dev_id(&edev->dev));
|
||||||
return (1);
|
return 1;
|
||||||
}
|
}
|
||||||
/* Fall through */
|
/* Fall through */
|
||||||
|
|
||||||
|
@ -893,13 +893,13 @@ static int net_check_prereq (proto_t protocol)
|
||||||
case BOOTP:
|
case BOOTP:
|
||||||
if (memcmp (NetOurEther, "\0\0\0\0\0\0", 6) == 0) {
|
if (memcmp (NetOurEther, "\0\0\0\0\0\0", 6) == 0) {
|
||||||
printf("*** ERROR: `%s.ethaddr' not set\n", dev_id(&edev->dev));
|
printf("*** ERROR: `%s.ethaddr' not set\n", dev_id(&edev->dev));
|
||||||
return (1);
|
return 1;
|
||||||
}
|
}
|
||||||
/* Fall through */
|
/* Fall through */
|
||||||
default:
|
default:
|
||||||
return (0);
|
return 0;
|
||||||
}
|
}
|
||||||
return (0); /* OK */
|
return 0; /* OK */
|
||||||
}
|
}
|
||||||
/**********************************************************************/
|
/**********************************************************************/
|
||||||
|
|
||||||
|
@ -921,7 +921,7 @@ NetCksum(uchar * ptr, int len)
|
||||||
xsum += *p++;
|
xsum += *p++;
|
||||||
xsum = (xsum & 0xffff) + (xsum >> 16);
|
xsum = (xsum & 0xffff) + (xsum >> 16);
|
||||||
xsum = (xsum & 0xffff) + (xsum >> 16);
|
xsum = (xsum & 0xffff) + (xsum >> 16);
|
||||||
return (xsum & 0xffff);
|
return xsum & 0xffff;
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
|
@ -1074,7 +1074,7 @@ void print_IPaddr (IPaddr_t x)
|
||||||
|
|
||||||
ushort getenv_VLAN(char *var)
|
ushort getenv_VLAN(char *var)
|
||||||
{
|
{
|
||||||
return (string_to_VLAN(getenv(var)));
|
return string_to_VLAN(getenv(var));
|
||||||
}
|
}
|
||||||
|
|
||||||
int string_to_ethaddr(const char *str, char *enetaddr)
|
int string_to_ethaddr(const char *str, char *enetaddr)
|
||||||
|
|
Loading…
Reference in New Issue