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: Kamil Rytarowski <n54@gmx.com>
---
 hw/net/e1000.c         | 4 ++--
 hw/net/e1000_regs.h    | 2 +-
 hw/net/e1000e_core.c   | 2 +-
 hw/net/e1000x_common.h | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/hw/net/e1000.c b/hw/net/e1000.c
index f2e5072d27..eebe3a9c13 100644
--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
@@ -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),
diff --git a/hw/net/e1000_regs.h b/hw/net/e1000_regs.h
index 23eed50b9c..ae99f58bab 100644
--- a/hw/net/e1000_regs.h
+++ b/hw/net/e1000_regs.h
@@ -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 */
diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c
index 81405640f0..43a8d89955 100644
--- a/hw/net/e1000e_core.c
+++ b/hw/net/e1000e_core.c
@@ -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),
diff --git a/hw/net/e1000x_common.h b/hw/net/e1000x_common.h
index 21bf28e0cc..3072ce9d50 100644
--- a/hw/net/e1000x_common.h
+++ b/hw/net/e1000x_common.h
@@ -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),
-- 
2.14.1

On Sun, 09/03 18:37, Kamil Rytarowski wrote:
> 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: Kamil Rytarowski <n54@gmx.com>

Cc Jason Wang (net maintainer).

Fam

Reviewed-by: Dmitry Fleytman <dmitry@daynix.com>

> On 4 Sep 2017, at 10:23 AM, Fam Zheng <famz@redhat.com> wrote:
> 
> On Sun, 09/03 18:37, Kamil Rytarowski wrote:
>> 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: Kamil Rytarowski <n54@gmx.com>
> 
> Cc Jason Wang (net maintainer).
> 
> Fam

Please put it on a pull-request queue. I don't maintain one myself.

On 04.09.2017 09:29, Dmitry Fleytman wrote:
> Reviewed-by: Dmitry Fleytman <dmitry@daynix.com>
> 
>> On 4 Sep 2017, at 10:23 AM, Fam Zheng <famz@redhat.com> wrote:
>>
>> On Sun, 09/03 18:37, Kamil Rytarowski wrote:
>>> 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: Kamil Rytarowski <n54@gmx.com>
>>
>> Cc Jason Wang (net maintainer).
>>
>> Fam
> 

On 2017年09月05日 07:51, Kamil Rytarowski wrote:
> Please put it on a pull-request queue. I don't maintain one myself.
>
> On 04.09.2017 09:29, Dmitry Fleytman wrote:
>> Reviewed-by: Dmitry Fleytman <dmitry@daynix.com>
>>
>>> On 4 Sep 2017, at 10:23 AM, Fam Zheng <famz@redhat.com> wrote:
>>>
>>> On Sun, 09/03 18:37, Kamil Rytarowski wrote:
>>>> 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: Kamil Rytarowski <n54@gmx.com>
>>> Cc Jason Wang (net maintainer).
>>>
>>> Fam

Applied, will be in next pull request.

Thanks