Commit 9c7ffe26 authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Jason Wang
Browse files

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: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
parent 3be9b352

hw/net/rtl8139.c

+0 −1
Original line number Diff line number Diff line
@@ -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

include/net/eth.h

+3 −1
Original line number Diff line number Diff line
@@ -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)

slirp/slirp.h

+1 −6
Original line number Diff line number Diff line
@@ -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   */