diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/bootp.h | 2 | ||||
| -rw-r--r-- | net/dns.h | 2 | ||||
| -rw-r--r-- | net/net.c | 4 | ||||
| -rw-r--r-- | net/net_rand.h | 4 | ||||
| -rw-r--r-- | net/nfs.h | 2 | ||||
| -rw-r--r-- | net/sntp.h | 2 | ||||
| -rw-r--r-- | net/tftp.c | 4 |
7 files changed, 10 insertions, 10 deletions
diff --git a/net/bootp.h b/net/bootp.h index fcb0a64e61..567340ec5d 100644 --- a/net/bootp.h +++ b/net/bootp.h @@ -49,7 +49,7 @@ struct bootp_hdr { char bp_sname[64]; /* Server host name */ char bp_file[128]; /* Boot file name */ char bp_vend[OPT_FIELD_SIZE]; /* Vendor information */ -}; +} __attribute__((packed)); #define BOOTP_HDR_SIZE sizeof(struct bootp_hdr) @@ -29,7 +29,7 @@ struct header { uint16_t nauth; /* Authority PRs */ uint16_t nother; /* Other PRs */ unsigned char data[1]; /* Data, variable length */ -}; +} __attribute__((packed)); void dns_start(void); /* Begin DNS */ @@ -489,7 +489,7 @@ restart: cdp_start(); break; #endif -#if defined(CONFIG_NETCONSOLE) && !(CONFIG_SPL_BUILD) +#if defined(CONFIG_NETCONSOLE) && !defined(CONFIG_SPL_BUILD) case NETCONS: nc_start(); break; @@ -1258,7 +1258,7 @@ void net_process_received_packet(uchar *in_packet, int len) } #endif -#if defined(CONFIG_NETCONSOLE) && !(CONFIG_SPL_BUILD) +#if defined(CONFIG_NETCONSOLE) && !defined(CONFIG_SPL_BUILD) nc_input_packet((uchar *)ip + IP_UDP_HDR_SIZE, src_ip, ntohs(ip->udp_dst), diff --git a/net/net_rand.h b/net/net_rand.h index ba9d0642cf..4bf9bd817e 100644 --- a/net/net_rand.h +++ b/net/net_rand.h @@ -16,11 +16,11 @@ */ static inline unsigned int seed_mac(void) { - unsigned char enetaddr[6]; + unsigned char enetaddr[ARP_HLEN]; unsigned int seed; /* get our mac */ - eth_getenv_enetaddr("ethaddr", enetaddr); + memcpy(enetaddr, eth_get_ethaddr(), ARP_HLEN); seed = enetaddr[5]; seed ^= enetaddr[4] << 8; @@ -79,7 +79,7 @@ struct rpc_t { uint32_t data[NFS_READ_SIZE]; } reply; } u; -}; +} __attribute__((packed)); void nfs_start(void); /* Begin NFS */ diff --git a/net/sntp.h b/net/sntp.h index 6a9c6bb82f..c38bceed3f 100644 --- a/net/sntp.h +++ b/net/sntp.h @@ -51,7 +51,7 @@ struct sntp_pkt_t { unsigned long long originate_timestamp; unsigned long long receive_timestamp; unsigned long long transmit_timestamp; -}; +} __attribute__((packed)); void sntp_start(void); /* Begin SNTP */ diff --git a/net/tftp.c b/net/tftp.c index ced45ec1f1..61e1671068 100644 --- a/net/tftp.c +++ b/net/tftp.c @@ -742,8 +742,8 @@ void tftp_start(enum proto_t protocol) (net_ip.s_addr >> 16) & 0xFF, (net_ip.s_addr >> 24) & 0xFF); - strncpy(tftp_filename, default_filename, MAX_LEN); - tftp_filename[MAX_LEN - 1] = 0; + strncpy(tftp_filename, default_filename, DEFAULT_NAME_LEN); + tftp_filename[DEFAULT_NAME_LEN - 1] = 0; printf("*** Warning: no boot file name; using '%s'\n", tftp_filename); |