diff options
| author | Joe Hershberger <joe.hershberger@ni.com> | 2012-05-23 07:59:14 +0000 | 
|---|---|---|
| committer | Joe Hershberger <joe.hershberger@ni.com> | 2012-05-23 17:46:21 -0500 | 
| commit | 22f6e99d5b0c54758646334c1153737a5585bd57 (patch) | |
| tree | e70b3679ff62e93345fc0f7e3960d37582cea612 /net/tftp.c | |
| parent | adf5d93e441eb3eacd8c0430d6064b35d47ad2a5 (diff) | |
| download | olio-uboot-2014.01-22f6e99d5b0c54758646334c1153737a5585bd57.tar.xz olio-uboot-2014.01-22f6e99d5b0c54758646334c1153737a5585bd57.zip | |
net: Refactor to protect access to the NetState variable
Changes to NetState now go through an accessor function called
net_set_state()
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Diffstat (limited to 'net/tftp.c')
| -rw-r--r-- | net/tftp.c | 8 | 
1 files changed, 4 insertions, 4 deletions
| diff --git a/net/tftp.c b/net/tftp.c index a04a832f8..bf32eabe8 100644 --- a/net/tftp.c +++ b/net/tftp.c @@ -177,7 +177,7 @@ store_block(unsigned block, uchar *src, unsigned len)  		rc = flash_write((char *)src, (ulong)(load_addr+offset), len);  		if (rc) {  			flash_perror(rc); -			NetState = NETLOOP_FAIL; +			net_set_state(NETLOOP_FAIL);  			return;  		}  	} else @@ -300,7 +300,7 @@ static void tftp_complete(void)  	}  #endif  	puts("\ndone\n"); -	NetState = NETLOOP_SUCCESS; +	net_set_state(NETLOOP_SUCCESS);  }  static void @@ -627,7 +627,7 @@ TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,  			if (MasterClient && (TftpBlock >= TftpEndingBlock)) {  				puts("\nMulticast tftp done\n");  				mcast_cleanup(); -				NetState = NETLOOP_SUCCESS; +				net_set_state(NETLOOP_SUCCESS);  			}  		} else  #endif @@ -644,7 +644,7 @@ TftpHandler(uchar *pkt, unsigned dest, IPaddr_t sip, unsigned src,  		case TFTP_ERR_ACCESS_DENIED:  			puts("Not retrying...\n");  			eth_halt(); -			NetState = NETLOOP_FAIL; +			net_set_state(NETLOOP_FAIL);  			break;  		case TFTP_ERR_UNDEFINED:  		case TFTP_ERR_DISK_FULL: |