From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33981) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHZr6-0007mW-9L for qemu-devel@nongnu.org; Fri, 08 Jan 2016 11:25:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aHZr2-00082s-28 for qemu-devel@nongnu.org; Fri, 08 Jan 2016 11:25:36 -0500 Received: from mail-wm0-x231.google.com ([2a00:1450:400c:c09::231]:35002) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHZr1-00082m-RU for qemu-devel@nongnu.org; Fri, 08 Jan 2016 11:25:31 -0500 Received: by mail-wm0-x231.google.com with SMTP id f206so141245745wmf.0 for ; Fri, 08 Jan 2016 08:25:31 -0800 (PST) References: <1452264088-17383-1-git-send-email-dgilbert@redhat.com> From: Alex =?utf-8?Q?Benn=C3=A9e?= In-reply-to: <1452264088-17383-1-git-send-email-dgilbert@redhat.com> Date: Fri, 08 Jan 2016 16:25:28 +0000 Message-ID: <87y4c0avif.fsf@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH] ether/slirp: Avoid redefinition of the same constants List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Dr. David Alan Gilbert (git)" Cc: jan.kiszka@siemens.com, jasowang@redhat.com, qemu-devel@nongnu.org, zhangchen.fnst@cn.fujitsu.com, samuel.thibault@ens-lyon.org Dr. David Alan Gilbert (git) writes: > From: "Dr. David Alan Gilbert" > > 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 Reviewed-by: Alex Bennée > > Signed-off-by: Dr. David Alan Gilbert > --- > 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 */ -- Alex Bennée