summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2009-10-13 10:52:49 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2009-10-13 10:54:14 +0200
commitc227c646e3729e61ca18c4b7c6d694a0463c5ee5 (patch)
treec3b4eac094fc1bb5877b29d5792836a8475f0a9a /net
parent9296260a7858f0e9cb4d0123bdabd72f1e457bbd (diff)
downloadbarebox-c227c646e3729e61ca18c4b7c6d694a0463c5ee5.tar.gz
barebox-c227c646e3729e61ca18c4b7c6d694a0463c5ee5.tar.xz
return is not a function
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'net')
-rw-r--r--net/net.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/net/net.c b/net/net.c
index 7d94a3f733..26be007733 100644
--- a/net/net.c
+++ b/net/net.c
@@ -388,7 +388,7 @@ int NetLoop(proto_t protocol)
if (ctrlc()) {
eth_halt();
puts ("\nAbort\n");
- return (-1);
+ return -1;
}
ArpTimeoutCheck();
@@ -420,7 +420,7 @@ int NetLoop(proto_t protocol)
case NETLOOP_FAIL:
eth_halt();
- return (-1);
+ return -1;
}
}
}
@@ -859,7 +859,7 @@ static int net_check_prereq (proto_t protocol)
case PING:
if (NetPingIP == 0) {
puts ("*** ERROR: ping address not given\n");
- return (1);
+ return 1;
}
goto common;
#endif
@@ -867,7 +867,7 @@ static int net_check_prereq (proto_t protocol)
case SNTP:
if (NetNtpServerIP == 0) {
puts ("*** ERROR: NTP server address not given\n");
- return (1);
+ return 1;
}
goto common;
#endif
@@ -878,13 +878,13 @@ static int net_check_prereq (proto_t protocol)
case TFTP:
if (NetServerIP == 0) {
printf("*** ERROR: `%s.serverip' not set\n", dev_id(&edev->dev));
- return (1);
+ return 1;
}
common:
if (NetOurIP == 0) {
printf("*** ERROR: `%s.ipaddr' not set\n", dev_id(&edev->dev));
- return (1);
+ return 1;
}
/* Fall through */
@@ -893,13 +893,13 @@ static int net_check_prereq (proto_t protocol)
case BOOTP:
if (memcmp (NetOurEther, "\0\0\0\0\0\0", 6) == 0) {
printf("*** ERROR: `%s.ethaddr' not set\n", dev_id(&edev->dev));
- return (1);
+ return 1;
}
/* Fall through */
default:
- return (0);
+ return 0;
}
- return (0); /* OK */
+ return 0; /* OK */
}
/**********************************************************************/
@@ -921,7 +921,7 @@ NetCksum(uchar * ptr, int len)
xsum += *p++;
xsum = (xsum & 0xffff) + (xsum >> 16);
xsum = (xsum & 0xffff) + (xsum >> 16);
- return (xsum & 0xffff);
+ return xsum & 0xffff;
}
int
@@ -1074,7 +1074,7 @@ void print_IPaddr (IPaddr_t x)
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)