diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2006-04-20 12:25:10 -0500 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2006-04-20 12:25:10 -0500 |
| commit | b86d7622b33892b1dafe761a7a9eaeeab9f3816b (patch) | |
| tree | 56b1b6fc978166abce4afa8e9dee0af94bfc3cd6 /net/net.c | |
| parent | f8edca2e9a128f526b1fe6f997f7adb852cf5b3c (diff) | |
| parent | 56a4a63c106cc317fc0fe42686a99416fc469f5b (diff) | |
| download | u-boot-imx-b86d7622b33892b1dafe761a7a9eaeeab9f3816b.zip u-boot-imx-b86d7622b33892b1dafe761a7a9eaeeab9f3816b.tar.gz u-boot-imx-b86d7622b33892b1dafe761a7a9eaeeab9f3816b.tar.bz2 | |
Merge branch 'master' of rsync://rsync.denx.de/git/u-boot
Diffstat (limited to 'net/net.c')
| -rw-r--r-- | net/net.c | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -92,6 +92,8 @@ #if (CONFIG_COMMANDS & CFG_CMD_NET) +DECLARE_GLOBAL_DATA_PTR; + #define ARP_TIMEOUT 5 /* Seconds before trying ARP again */ #ifndef CONFIG_NET_RETRY_COUNT # define ARP_TIMEOUT_COUNT 5 /* # of timeouts before giving up */ @@ -266,8 +268,6 @@ void ArpTimeoutCheck(void) int NetLoop(proto_t protocol) { - DECLARE_GLOBAL_DATA_PTR; - bd_t *bd = gd->bd; #ifdef CONFIG_NET_MULTI @@ -572,9 +572,6 @@ startAgainHandler(uchar * pkt, unsigned dest, unsigned src, unsigned len) void NetStartAgain (void) { -#ifdef CONFIG_NET_MULTI - DECLARE_GLOBAL_DATA_PTR; -#endif char *nretry; int noretry = 0, once = 0; |