diff options
| author | Wolfgang Denk <[email protected]> | 2008-04-30 23:04:51 +0200 |
|---|---|---|
| committer | Wolfgang Denk <[email protected]> | 2008-04-30 23:04:51 +0200 |
| commit | fed4de0135fdc13565704669cdf80902bbfe3c42 (patch) | |
| tree | b8fc14a0c94687ac766eba56cb8ec445dfad0668 /include/net.h | |
| parent | 42ffcec3f9eba010a662d5b42981812b6bebfb9a (diff) | |
| parent | 12bc4e94251c369c529ffa505cf58b148c372f7f (diff) | |
Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master
Diffstat (limited to 'include/net.h')
| -rw-r--r-- | include/net.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/net.h b/include/net.h index f6decdca883..9a2f03fe983 100644 --- a/include/net.h +++ b/include/net.h @@ -412,10 +412,10 @@ extern void print_IPaddr (IPaddr_t); * footprint in our tests. */ /* return IP *in network byteorder* */ -static inline IPaddr_t NetReadIP(void *from) +static inline IPaddr_t NetReadIP(volatile void *from) { IPaddr_t ip; - memcpy((void*)&ip, from, sizeof(ip)); + memcpy((void*)&ip, (void*)from, sizeof(ip)); return ip; } @@ -434,9 +434,9 @@ static inline void NetWriteIP(void *to, IPaddr_t ip) } /* copy IP */ -static inline void NetCopyIP(void *to, void *from) +static inline void NetCopyIP(volatile void *to, void *from) { - memcpy(to, from, sizeof(IPaddr_t)); + memcpy((void*)to, from, sizeof(IPaddr_t)); } /* copy ulong */ |