Commit 757704f1 authored by Kamil Rytarowski's avatar Kamil Rytarowski Committed by Jason Wang
Browse files

e1000: Rename the SEC symbol to SEQEC 



SunOS defines SEC in <sys/time.h> as 1 (commonly used time symbols).

This fixes build on SmartOS (Joyent).

Patch cherry-picked from pkgsrc by jperkin (Joyent).

Signed-off-by: default avatarKamil Rytarowski <n54@gmx.com>
Reviewed-by: default avatarDmitry Fleytman <dmitry@daynix.com>
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
parent 0522a959

hw/net/e1000.c

+2 −2
Original line number Diff line number Diff line
@@ -1127,7 +1127,7 @@ static uint32_t (*macreg_readops[])(E1000State *, int) = { 
    getreg(TADV),     getreg(ITR),      getreg(FCRUC),    getreg(IPAV),

    getreg(WUC),      getreg(WUS),      getreg(SCC),      getreg(ECOL),

    getreg(MCC),      getreg(LATECOL),  getreg(COLC),     getreg(DC),

    getreg(TNCRS),    getreg(SEC),      getreg(CEXTERR),  getreg(RLEC),

    getreg(TNCRS),    getreg(SEQEC),    getreg(CEXTERR),  getreg(RLEC),

    getreg(XONRXC),   getreg(XONTXC),   getreg(XOFFRXC),  getreg(XOFFTXC),

    getreg(RFC),      getreg(RJC),      getreg(RNBC),     getreg(TSCTFC),

    getreg(MGTPRC),   getreg(MGTPDC),   getreg(MGTPTC),   getreg(GORCL),
@@ -1223,7 +1223,7 @@ static const uint8_t mac_reg_access[0x8000] = { 
    [FFLT]    = markflag(MAC),    [FFMT]    = markflag(MAC),

    [SCC]     = markflag(MAC),    [FCRUC]   = markflag(MAC),

    [LATECOL] = markflag(MAC),    [COLC]    = markflag(MAC),

    [SEC]     = markflag(MAC),    [CEXTERR] = markflag(MAC),

    [SEQEC]   = markflag(MAC),    [CEXTERR] = markflag(MAC),

    [XONTXC]  = markflag(MAC),    [XOFFRXC] = markflag(MAC),

    [RJC]     = markflag(MAC),    [RNBC]    = markflag(MAC),

    [MGTPDC]  = markflag(MAC),    [MGTPTC]  = markflag(MAC),

hw/net/e1000_regs.h

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ 
#define E1000_COLC     0x04028  /* Collision Count - R/clr */

#define E1000_DC       0x04030  /* Defer Count - R/clr */

#define E1000_TNCRS    0x04034  /* TX-No CRS - R/clr */

#define E1000_SEC      0x04038  /* Sequence Error Count - R/clr */

#define E1000_SEQEC    0x04038  /* Sequence Error Count - R/clr */

#define E1000_CEXTERR  0x0403C  /* Carrier Extension Error Count - R/clr */

#define E1000_RLEC     0x04040  /* Receive Length Error Count - R/clr */

#define E1000_XONRXC   0x04048  /* XON RX Count - R/clr */

hw/net/e1000e_core.c

+1 −1
Original line number Diff line number Diff line
@@ -2855,7 +2855,7 @@ static uint32_t (*e1000e_macreg_readops[])(E1000ECore *, int) = { 
    e1000e_getreg(RDLEN0),

    e1000e_getreg(RDH1),

    e1000e_getreg(LATECOL),

    e1000e_getreg(SEC),

    e1000e_getreg(SEQEC),

    e1000e_getreg(XONTXC),

    e1000e_getreg(WUS),

    e1000e_getreg(GORCL),

hw/net/e1000x_common.h

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ enum { 
    defreg(VFTA),    defreg(VET),     defreg(RDTR),    defreg(RADV),

    defreg(TADV),    defreg(ITR),     defreg(SCC),     defreg(ECOL),

    defreg(MCC),     defreg(LATECOL), defreg(COLC),    defreg(DC),

    defreg(TNCRS),   defreg(SEC),     defreg(CEXTERR), defreg(RLEC),

    defreg(TNCRS),   defreg(SEQEC),   defreg(CEXTERR), defreg(RLEC),

    defreg(XONRXC),  defreg(XONTXC),  defreg(XOFFRXC), defreg(XOFFTXC),

    defreg(FCRUC),   defreg(AIT),     defreg(TDFH),    defreg(TDFT),

    defreg(TDFHS),   defreg(TDFTS),   defreg(TDFPC),   defreg(WUC),