[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 24/24] ether/slirp: Avoid redefinition of the same co
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL 24/24] ether/slirp: Avoid redefinition of the same constants |
Date: |
Mon, 11 Jan 2016 13:31:15 +0800 |
From: "Dr. David Alan Gilbert" <address@hidden>
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 <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
hw/net/rtl8139.c | 1 -
include/net/eth.h | 4 +++-
slirp/slirp.h | 7 +------
3 files changed, 4 insertions(+), 8 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
diff --git a/include/net/eth.h b/include/net/eth.h
index b3273b8..84384fe 100644
--- a/include/net/eth.h
+++ b/include/net/eth.h
@@ -32,6 +32,7 @@
#include "qemu/iov.h"
#define ETH_ALEN 6
+#define ETH_HLEN 14
struct eth_header {
uint8_t h_dest[ETH_ALEN]; /* destination eth addr */
@@ -170,7 +171,8 @@ struct tcp_hdr {
#define IP_HEADER_VERSION(ip) \
((ip->ip_ver_len >> 4)&0xf)
-#define ETH_P_IP (0x0800)
+#define ETH_P_IP (0x0800) /* Internet Protocol packet */
+#define ETH_P_ARP (0x0806) /* Address Resolution packet */
#define ETH_P_IPV6 (0x86dd)
#define ETH_P_VLAN (0x8100)
#define ETH_P_DVLAN (0x88a8)
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 */
--
2.5.0
- [Qemu-devel] [PULL 14/24] vmxnet3: Change offsets of msi/msix pci capabilities, (continued)
- [Qemu-devel] [PULL 14/24] vmxnet3: Change offsets of msi/msix pci capabilities, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 15/24] vmxnet3: Change the offset of the MSIX PBA table, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 16/24] vmxnet3: Introduce 'x-old-msi-offsets' back-compat property, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 17/24] vmxnet3: coding: Introduce VMXNET3Class, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 18/24] vmxnet3: The vmxnet3 device is a PCIE endpoint, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 19/24] vmxnet3: Report the Device Serial Number capability, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 20/24] vmxnet3: Introduce 'x-disable-pcie' back-compat property, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 21/24] net: rocker: fix an incorrect array bounds check, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 23/24] l2tpv3: fix cookie decoding, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 22/24] net: ne2000: fix bounds check in ioport operations, Jason Wang, 2016/01/11
- [Qemu-devel] [PULL 24/24] ether/slirp: Avoid redefinition of the same constants,
Jason Wang <=
- Re: [Qemu-devel] [PULL 00/24] Net patches, Peter Maydell, 2016/01/11