From patchwork Sun Sep 3 16:37:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamil Rytarowski X-Patchwork-Id: 809333 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xlf9T5HlYz9t2f for ; Mon, 4 Sep 2017 02:50:17 +1000 (AEST) Received: from localhost ([::1]:59989 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1doY6A-0003qQ-MW for incoming@patchwork.ozlabs.org; Sun, 03 Sep 2017 12:50:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43936) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1doY5d-0003oR-9n for qemu-devel@nongnu.org; Sun, 03 Sep 2017 12:49:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1doY5Y-0003VE-GH for qemu-devel@nongnu.org; Sun, 03 Sep 2017 12:49:41 -0400 Received: from mout.gmx.net ([212.227.15.19]:53956) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1doY5Y-0003U1-4R for qemu-devel@nongnu.org; Sun, 03 Sep 2017 12:49:36 -0400 Received: from localhost.localdomain ([185.58.161.191]) by mail.gmx.com (mrgmx003 [212.227.17.184]) with ESMTPSA (Nemesis) id 0Lkx9B-1dEfVI2Zvx-00ajJN; Sun, 03 Sep 2017 18:49:33 +0200 From: Kamil Rytarowski To: dmitry@daynix.com Date: Sun, 3 Sep 2017 18:37:26 +0200 Message-Id: <20170903163726.16541-1-n54@gmx.com> X-Mailer: git-send-email 2.14.1 X-Provags-ID: V03:K0:iLp5gy8GjElSCVJdxv4vQ1/7L07NUvNgEIeEqQNlli8T9J8MfQH H3lycEtxNsvYgxQmX/90sKLuFm7e9rI678vQ+rEKlcHFhrAeFeC2bASPU6uIISBnzHKd9XS F/W45FdqRkQ3EIG2uLXo2uHDzY7rNscZyuKLeA9zeehVIonB4HC+3PMOiDQuJbKtYTbusWB eBNfNoksiVT7NTo5HiHuQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:c3YyprABJWU=:TvnmS7ip8XwW4dEmycq8um 5NsnsvfvUKiRe9g/iVF46d5EJUlxmLnI7tG2ohX/1iz5Y86sR1j2+210yv1oxTPbBMMiUaGqn yJ0PySKPbaY/ZzcDfnn7HkCwBjHNALScvqZd2yxTNKKcn66wtj+yd4XDr//RJF0aQx6dh8V4Y C4hO/SJpW2k1RNfFa/XyMVAMD5jkSqMCRJbxd5uus4YCy7sfWRJBfQR9fZlXe1gvemnWhLpGF JZhA7Xd3EfMr0C7R9LrWnyxPhVhqUhgtheXWvWqcHgyQoe7TR98k5ABIgwjQ6YYQxGIUIHIIJ Ie0QRfOE8tY1uq1SS4OvTTwpim7LM0fIGo/JWebxwHgM+SrzW+58gkvBwdwlhGkwCm3h/dEDj Ni8poyBoMqd5MHuSbRVs1DIbIcAGAdwKda7BGuYJepVyEPpohRoFJ2uXJIPEIqbAKSjVPRuP/ LvHu34P6mwNlrCI/D0VaoN8Y2p/F54wez5PuLq3Mz5gUrFTUaKV3fZUCF05PUjF3Xvrw+IV6e puhGlVxc3QN362byuyILoR6JvVc/zCdZdpY8Vwhmk0IsbWe8637t2JXTzI8qAD9McOmI9ZWn9 xaIzz3WwLj8qgAQ6f/W8FNzHCBv2/1L+e9aXpTOukYM3685yCesZuAyMUI/+J7lVB+dRGARif uJPjxdpmLBapMZ6cF/bl0Wshlo3JX+14yi+uycnryHfkFY/mQbsHdhSKkslv3gcXo+P6aO+HD Mkg5WG7YKMJty3RJyvL2RuzH7ON3axODhmKuaoz7KQzXuKhxAtCVpnNtzipeHaBsdnTHVWcES XM2f2S3/mAzNZJYjWFpH8O7InPgxw== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.15.19 Subject: [Qemu-devel] [PATCH] e1000: Rename the SEC symbol to SEQEC X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kamil Rytarowski , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" SunOS defines SEC in 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 Reviewed-by: Dmitry Fleytman --- 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),