9
0
Fork 0

bootp: remove unnecessary counter

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2009-08-19 14:37:37 +02:00
parent f787f8fbf7
commit 8fe37b4e2e
3 changed files with 1 additions and 5 deletions

View File

@ -45,7 +45,6 @@
#endif #endif
ulong BootpID; ulong BootpID;
int BootpTry;
#ifdef CONFIG_BOOTP_RANDOM_DELAY #ifdef CONFIG_BOOTP_RANDOM_DELAY
ulong seed1, seed2; ulong seed1, seed2;
#endif #endif
@ -533,7 +532,7 @@ BootpRequest (void)
dhcp_state = INIT; dhcp_state = INIT;
#endif #endif
printf("BOOTP broadcast %d\n", ++BootpTry); printf("BOOTP broadcast\n");
pkt = NetTxPacket; pkt = NetTxPacket;
memset ((void*)pkt, 0, PKTSIZE); memset ((void*)pkt, 0, PKTSIZE);

View File

@ -58,7 +58,6 @@ typedef struct
/* bootp.c */ /* bootp.c */
extern ulong BootpID; /* ID of cur BOOTP request */ extern ulong BootpID; /* ID of cur BOOTP request */
extern char BootFile[128]; /* Boot file name */ extern char BootFile[128]; /* Boot file name */
extern int BootpTry;
#ifdef CONFIG_BOOTP_RANDOM_DELAY #ifdef CONFIG_BOOTP_RANDOM_DELAY
ulong seed1, seed2; /* seed for random BOOTP delay */ ulong seed1, seed2; /* seed for random BOOTP delay */
#endif #endif

View File

@ -317,14 +317,12 @@ int NetLoop(proto_t protocol)
#ifdef CONFIG_NET_DHCP #ifdef CONFIG_NET_DHCP
case DHCP: case DHCP:
/* Start with a clean slate... */ /* Start with a clean slate... */
BootpTry = 0;
NetOurIP = 0; NetOurIP = 0;
DhcpRequest(); /* Basically same as BOOTP */ DhcpRequest(); /* Basically same as BOOTP */
break; break;
#endif #endif
#ifdef CONFIG_NET_BOOTP #ifdef CONFIG_NET_BOOTP
case BOOTP: case BOOTP:
BootpTry = 0;
BootpRequest (); BootpRequest ();
break; break;
#endif #endif