diff options
| author | Tom Rini <trini@konsulko.com> | 2020-04-27 17:50:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-04-27 17:50:43 -0400 |
| commit | 08977f873f4034307796173784fc17a11188a0cb (patch) | |
| tree | 8045cbf4733f1ff77d9b313a2d4ae48cb949babb /net/tftp.c | |
| parent | 9b20a794a71151a3a690242b5161b4ca5effd3e7 (diff) | |
| parent | 0015e6defe66022b38c4fe0e2c793728ab2c3cdd (diff) | |
Merge branch '2020-04-27-master-imports'
- Assorted bugfixes.
- Documentation improvements including support for https://u-boot.readthedocs.io/
Diffstat (limited to 'net/tftp.c')
| -rw-r--r-- | net/tftp.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/net/tftp.c b/net/tftp.c index 585eb6ef0c..be24e63075 100644 --- a/net/tftp.c +++ b/net/tftp.c @@ -133,14 +133,9 @@ static char tftp_filename[MAX_LEN]; * almost-MTU block sizes. At least try... fall back to 512 if need be. * (but those using CONFIG_IP_DEFRAG may want to set a larger block in cfg file) */ -#ifdef CONFIG_TFTP_BLOCKSIZE -#define TFTP_MTU_BLOCKSIZE CONFIG_TFTP_BLOCKSIZE -#else -#define TFTP_MTU_BLOCKSIZE 1468 -#endif static unsigned short tftp_block_size = TFTP_BLOCK_SIZE; -static unsigned short tftp_block_size_option = TFTP_MTU_BLOCKSIZE; +static unsigned short tftp_block_size_option = CONFIG_TFTP_BLOCKSIZE; static inline int store_block(int block, uchar *src, unsigned int len) { |