only the ping code is interested in the ping ip
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
parent
5619409df6
commit
faa61661cf
|
@ -305,8 +305,6 @@ typedef enum { BOOTP, RARP, ARP, TFTP, DHCP, PING, DNS, NFS, CDP, NETCONS, SNTP
|
||||||
/* from net/net.c */
|
/* from net/net.c */
|
||||||
extern char BootFile[128]; /* Boot File name */
|
extern char BootFile[128]; /* Boot File name */
|
||||||
|
|
||||||
extern IPaddr_t NetPingIP; /* the ip address to ping */
|
|
||||||
|
|
||||||
/* when CDP completes these hold the return values */
|
/* when CDP completes these hold the return values */
|
||||||
extern ushort CDPNativeVLAN;
|
extern ushort CDPNativeVLAN;
|
||||||
extern ushort CDPApplianceVLAN;
|
extern ushort CDPApplianceVLAN;
|
||||||
|
|
14
net/net.c
14
net/net.c
|
@ -135,12 +135,6 @@ ushort NetOurNativeVLAN = 0xFFFF; /* ditto */
|
||||||
|
|
||||||
char BootFile[128]; /* Boot File name */
|
char BootFile[128]; /* Boot File name */
|
||||||
|
|
||||||
#ifdef CONFIG_NET_PING
|
|
||||||
IPaddr_t NetPingIP; /* the ip address to ping */
|
|
||||||
|
|
||||||
extern void PingStart(void);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef CONFIG_NET_SNTP
|
#ifdef CONFIG_NET_SNTP
|
||||||
IPaddr_t NetNtpServerIP; /* NTP server IP address */
|
IPaddr_t NetNtpServerIP; /* NTP server IP address */
|
||||||
int NetTimeOffset=0; /* offset time from UTC */
|
int NetTimeOffset=0; /* offset time from UTC */
|
||||||
|
@ -790,14 +784,6 @@ static int net_check_prereq (proto_t protocol)
|
||||||
|
|
||||||
switch (protocol) {
|
switch (protocol) {
|
||||||
/* Fall through */
|
/* Fall through */
|
||||||
#ifdef CONFIG_NET_PING
|
|
||||||
case PING:
|
|
||||||
if (NetPingIP == 0) {
|
|
||||||
puts ("*** ERROR: ping address not given\n");
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
goto common;
|
|
||||||
#endif
|
|
||||||
#ifdef CONFIG_NET_SNTP
|
#ifdef CONFIG_NET_SNTP
|
||||||
case SNTP:
|
case SNTP:
|
||||||
if (NetNtpServerIP == 0) {
|
if (NetNtpServerIP == 0) {
|
||||||
|
|
|
@ -5,6 +5,8 @@
|
||||||
|
|
||||||
static ushort PingSeqNo;
|
static ushort PingSeqNo;
|
||||||
|
|
||||||
|
static IPaddr_t NetPingIP; /* the ip address to ping */
|
||||||
|
|
||||||
static int PingSend(void)
|
static int PingSend(void)
|
||||||
{
|
{
|
||||||
static uchar mac[6];
|
static uchar mac[6];
|
||||||
|
|
Loading…
Reference in New Issue