diff options
| author | David 'Digit' Turner <digit@android.com> | 2011-02-09 15:34:16 -0800 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2011-02-09 15:34:16 -0800 |
| commit | 1ebd6d701f91c34f4562f522d5b2ce32be056d85 (patch) | |
| tree | c79222448d637e3cf8d9fc5279d0293275812521 /net-android.c | |
| parent | d98942188f1b190b2e2a2a7a4cb11bc4f8a22739 (diff) | |
| parent | a39b10bd2574825a815d6ad854499dd127cfa9cb (diff) | |
| download | external_qemu-1ebd6d701f91c34f4562f522d5b2ce32be056d85.zip external_qemu-1ebd6d701f91c34f4562f522d5b2ce32be056d85.tar.gz external_qemu-1ebd6d701f91c34f4562f522d5b2ce32be056d85.tar.bz2 | |
Merge "Build arm and x86 binaries at the same time."
Diffstat (limited to 'net-android.c')
| -rw-r--r-- | net-android.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net-android.c b/net-android.c index 234235b..6459eff 100644 --- a/net-android.c +++ b/net-android.c @@ -126,7 +126,7 @@ #include "libslirp.h" #endif -#if defined(CONFIG_SHAPER) +#if defined(CONFIG_ANDROID) #include "shaper.h" #endif @@ -730,7 +730,7 @@ ip_packet_is_internal( const uint8_t* data, size_t size ) return ( data[12] == 10 && data[16] == 10); } -#ifdef CONFIG_SHAPER +#ifdef CONFIG_ANDROID NetShaper slirp_shaper_in; NetShaper slirp_shaper_out; @@ -773,12 +773,12 @@ slirp_init_shapers( void ) netshaper_set_rate( slirp_shaper_in, qemu_net_upload_speed ); } -#endif /* CONFIG_SHAPER */ +#endif /* CONFIG_ANDROID */ int slirp_can_output(void) { -#ifdef CONFIG_SHAPER +#ifdef CONFIG_ANDROID return !slirp_vc || ( netshaper_can_send(slirp_shaper_out) && qemu_can_send_packet(slirp_vc) ); @@ -799,7 +799,7 @@ void slirp_output(const uint8_t *pkt, int pkt_len) if (!slirp_vc) return; -#ifdef CONFIG_SHAPER +#ifdef CONFIG_ANDROID netshaper_send(slirp_shaper_out, (void*)pkt, pkt_len); #else qemu_send_packet(slirp_vc, pkt, pkt_len); @@ -820,7 +820,7 @@ static ssize_t slirp_receive(VLANClientState *vc, const uint8_t *buf, size_t siz if (qemu_tcpdump_active) qemu_tcpdump_packet(buf, size); -#ifdef CONFIG_SHAPER +#ifdef CONFIG_ANDROID netshaper_send(slirp_shaper_in, (char*)buf, size); #else slirp_input(buf, size); |