diff options
| author | Dr. David Alan Gilbert <dgilbert@redhat.com> | 2016-01-08 14:41:28 +0000 |
|---|---|---|
| committer | Timothy Pearson <tpearson@raptorengineering.com> | 2019-11-29 19:28:23 -0600 |
| commit | f5a990e03e8110c3e38292c0c786011d2a4cec10 (patch) | |
| tree | b2d04c214386ba7bd7723649f4634b14037514fd /hw/net | |
| parent | f6058036408aaec478a70a124353fb055ef570c8 (diff) | |
| download | hqemu-f5a990e03e8110c3e38292c0c786011d2a4cec10.zip hqemu-f5a990e03e8110c3e38292c0c786011d2a4cec10.tar.gz | |
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 'hw/net')
| -rw-r--r-- | hw/net/rtl8139.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c index 68e43f3..d192d57 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -74,7 +74,6 @@ ( ( input ) & ( size - 1 ) ) #define ETHER_TYPE_LEN 2 -#define ETH_HLEN (ETH_ALEN * 2 + ETHER_TYPE_LEN) #define ETH_MTU 1500 #define VLAN_TCI_LEN 2 |
