Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-22 14:30:31 +00:00
Code Issues Projects Releases Wiki Activity

zcip: fix unaligned trap on ARM

Browse Source
This commit is contained in:
Denis Vlasenko 2007-09-27 11:15:42 +00:00
parent 7c654ae9df
commit 6124c37135
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
networking/zcip.c
View File

@ -160,7 +160,8 @@ int zcip_main(int argc, char **argv);
int zcip_main(int argc, char **argv) int zcip_main(int argc, char **argv)
{ {
int state = PROBE; int state = PROBE;
struct ether_addr eth_addr; /* Prevent unaligned traps for ARM (see srand() below) */
struct ether_addr eth_addr __attribute__(( aligned(sizeof(unsigned)) ));
const char *why; const char *why;
int fd; int fd;
char *r_opt; char *r_opt;
@ -252,7 +253,7 @@ int zcip_main(int argc, char **argv)
// the hardware address or else the last address we used. // the hardware address or else the last address we used.
// NOTE: the sequence of addresses we try changes only // NOTE: the sequence of addresses we try changes only
// depending on when we detect conflicts. // depending on when we detect conflicts.
srand(*(unsigned*)&ifr.ifr_hwaddr.sa_data); srand(*(unsigned*)&eth_addr);
if (ip.s_addr == 0) if (ip.s_addr == 0)
pick(&ip); pick(&ip);