diff options
author | Dr. David Alan Gilbert <dgilbert@redhat.com> | 2016-01-08 14:41:28 +0000 |
---|---|---|
committer | Jason Wang <jasowang@redhat.com> | 2016-01-11 11:01:35 +0800 |
commit | 9c7ffe266485c87e8e76d59af22e96866c202e42 (patch) | |
tree | abbf7658cb3891a3309b87c7f9d214892471c0cb /slirp | |
parent | 3be9b3528debd985b7a84ace0626cacf5ffe5ec4 (diff) | |
download | qemu-9c7ffe266485c87e8e76d59af22e96866c202e42.zip qemu-9c7ffe266485c87e8e76d59af22e96866c202e42.tar.gz qemu-9c7ffe266485c87e8e76d59af22e96866c202e42.tar.bz2 |
ether/slirp: Avoid redefinition of the same constants
eth.h and slirp.h both define ETH_ALEN and ETH_P_IP
rtl8139.c and eth.h both define ETH_HLEN
Move the related constant (ETH_P_ARP) from slirp.h to eth.h, and
remove the duplicates; make slirp.h include eth.h
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Diffstat (limited to 'slirp')
-rw-r--r-- | slirp/slirp.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/slirp/slirp.h b/slirp/slirp.h index 6589d7e..ec0a4c2 100644 --- a/slirp/slirp.h +++ b/slirp/slirp.h @@ -135,6 +135,7 @@ void free(void *ptr); #include "qemu/queue.h" #include "qemu/sockets.h" +#include "net/eth.h" #include "libslirp.h" #include "ip.h" @@ -158,12 +159,6 @@ void free(void *ptr); #include "bootp.h" #include "tftp.h" -#define ETH_ALEN 6 -#define ETH_HLEN 14 - -#define ETH_P_IP 0x0800 /* Internet Protocol packet */ -#define ETH_P_ARP 0x0806 /* Address Resolution packet */ - #define ARPOP_REQUEST 1 /* ARP request */ #define ARPOP_REPLY 2 /* ARP reply */ |