diff options
| author | Anthony Liguori <anthony@codemonkey.ws> | 2013-09-03 12:31:43 -0500 |
|---|---|---|
| committer | Anthony Liguori <anthony@codemonkey.ws> | 2013-09-03 12:31:44 -0500 |
| commit | 5a93d5c2abc719bd44f6c9fbeed88d3cae712606 (patch) | |
| tree | b3e9244146ce4bd678bdcf5b452b702f4be0ec8f /slirp/arp_table.c | |
| parent | 9ea0f58fc723daeb9e1dba9a762269e8cbbd1b73 (diff) | |
| parent | fcdda211f9239f4218f96cdc336a482f7103d90b (diff) | |
| download | focaccia-qemu-5a93d5c2abc719bd44f6c9fbeed88d3cae712606.tar.gz focaccia-qemu-5a93d5c2abc719bd44f6c9fbeed88d3cae712606.zip | |
Merge remote-tracking branch 'mjt/trivial-patches' into staging
# By Stefan Weil (6) and others # Via Michael Tokarev * mjt/trivial-patches: aio / timers: use g_usleep() not sleep() adlib: sort offsets in portio registration qmp: fix integer usage in examples tci: Remove function tcg_out64 (fix broken build) target-arm: Report unimplemented opcodes (LOG_UNIMP) pflash_cfi02.c: fix debug macro configure: Remove unneeded redirections of stderr (pkg-config --exists) configure: Remove unneeded redirections of stderr (pkg-config --cflags, --libs) configure: Don't write .pyc files by default (python -B) curl: qemu_bh_new() can never return NULL slirp/arp_table.c: Avoid shifting into sign bit of signed integers configure: disable clang -Wstring-plus-int warning rdma: silly ipv6 bugfix misc: Fix some typos in names and comments slirp: Port redirection option behave differently on Linux and Windows Message-id: 1378119695-14568-1-git-send-email-mjt@msgid.tls.msk.ru Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>
Diffstat (limited to 'slirp/arp_table.c')
| -rw-r--r-- | slirp/arp_table.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/slirp/arp_table.c b/slirp/arp_table.c index bf698c1ac5..ecdb0baee4 100644 --- a/slirp/arp_table.c +++ b/slirp/arp_table.c @@ -38,7 +38,7 @@ void arp_table_add(Slirp *slirp, uint32_t ip_addr, uint8_t ethaddr[ETH_ALEN]) ethaddr[3], ethaddr[4], ethaddr[5])); /* Check 0.0.0.0/8 invalid source-only addresses */ - if ((ip_addr & htonl(~(0xf << 28))) == 0) { + if ((ip_addr & htonl(~(0xfU << 28))) == 0) { return; } @@ -74,7 +74,7 @@ bool arp_table_search(Slirp *slirp, uint32_t ip_addr, DEBUG_ARG("ip = 0x%x", ip_addr); /* Check 0.0.0.0/8 invalid source-only addresses */ - assert((ip_addr & htonl(~(0xf << 28))) != 0); + assert((ip_addr & htonl(~(0xfU << 28))) != 0); /* If broadcast address */ if (ip_addr == 0xffffffff || ip_addr == broadcast_addr) { |