| commit | 9c7ffe266485c87e8e76d59af22e96866c202e42 | |
| author | Dr. David Alan Gilbert <dgilbert@redhat.com> | |
| Fri, 8 Jan 2016 14:41:28 +0000 (8 14:41 +0000) | ||
| committer | Jason Wang <jasowang@redhat.com> | |
| Mon, 11 Jan 2016 03:01:35 +0000 (11 11:01 +0800) | ||
| tree | abbf7658cb3891a3309b87c7f9d214892471c0cb | treesnapshot (tar.gz zip) |
| parent | 3be9b3528debd985b7a84ace0626cacf5ffe5ec4 | commitdiff |
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>
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>
| hw/net/rtl8139.c | diffblobblamehistory | |
| include/net/eth.h | diffblobblamehistory | |
| slirp/slirp.h | diffblobblamehistory |