From owner-dev-commits-src-main@freebsd.org Wed Jan 27 01:06:39 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E86654E86B7; Wed, 27 Jan 2021 01:06:39 +0000 (UTC) (envelope-from agh@riseup.net) Received: from mx1.riseup.net (mx1.riseup.net [198.252.153.129]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.riseup.net", Issuer "Sectigo RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DQQRM4tXcz4lG8; Wed, 27 Jan 2021 01:06:39 +0000 (UTC) (envelope-from agh@riseup.net) Received: from fews1.riseup.net (unknown [10.0.1.83]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.riseup.net", Issuer "Sectigo RSA Domain Validation Secure Server CA" (not verified)) by mx1.riseup.net (Postfix) with ESMTPS id 4DQQRB3JQBzFmbP; Tue, 26 Jan 2021 17:06:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1611709590; bh=DQanqt5slBhI7/P9w7kbkNtWqwjHJVNEfdnvtS5ayrM=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=SARMmN4nDmjr0u2GFJh3deXD+HLLfPdYrGYwfvxNZeCGTAgHBhw7P78IvRTJOqI45 Ff1gWlx8RUPmzj8xWF5uCfTmEUsX/UPYXX9VlTEnih4MRs25eg7aqCPIyBjqXnmTsr oZmjBdm3elyTuA9WxQ/nsNt2BaKi0B/QPNrDCqi4= X-Riseup-User-ID: D5028D2B3C2FBB7BFF6EFE59C47BFC4C9482ED096EEB12EF4C21EFC1B6DEFE95 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews1.riseup.net (Postfix) with ESMTPSA id 4DQQRB1gJdz5wF0; Tue, 26 Jan 2021 17:06:30 -0800 (PST) MIME-Version: 1.0 Date: Tue, 26 Jan 2021 17:06:30 -0800 From: al To: Marius Strobl Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: c1655b0f8998 - main - e1000: consistently use the hw variables In-Reply-To: <202101262210.10QMAHPT060959@gitrepo.freebsd.org> References: <202101262210.10QMAHPT060959@gitrepo.freebsd.org> Message-ID: <74a46a186ae8148a8fec936d1b791ac5@riseup.net> Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4DQQRM4tXcz4lG8 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jan 2021 01:06:40 -0000 On 2021-01-27 06:10, Marius Strobl wrote: > The branch main has been updated by marius: Hi Marius, > URL: > https://cgit.FreeBSD.org/src/commit/?id=c1655b0f8998f9e842a004f33e7c9c01c5d9e879 [...] > e1000: consistently use the hw variables > > It's rather confusing when adapter->hw and hw are mixed and matched > within a particular function. > Some of this was missed in cd1cf2fc1d49c509ded05dcd41b7600a5957fb9a > and r353778 respectively. > --- > sys/dev/e1000/if_em.c | 157 ++++++++++++++++++++++++-------------------------- > 1 file changed, 75 insertions(+), 82 deletions(-) $ make buildkernel is now failing with: --- if_em.o --- /usr/src/sys/dev/e1000/if_em.c:831:8: error: member reference type 'struct e1000_hw *' is a pointer; did you mean to use '->'? if (hw.mac.type >= igb_mac_min) { ~~^ -> /usr/src/sys/dev/e1000/if_em.c:843:9: error: member reference type 'struct e1000_hw *' is a pointer; did you mean to use '->'? if (hw.mac.type != e1000_82575) ~~^ -> /usr/src/sys/dev/e1000/if_em.c:851:15: error: member reference type 'struct e1000_hw *' is a pointer; did you mean to use '->'? } else if (hw.mac.type >= em_mac_min) { ~~^ -> /usr/src/sys/dev/e1000/if_em.c:883:9: error: member reference type 'struct e1000_hw *' is a pointer; did you mean to use '->'? if (hw.mac.type == e1000_82574) { ~~^ -> /usr/src/sys/dev/e1000/if_em.c:897:9: error: member reference type 'struct e1000_hw *' is a pointer; did you mean to use '->'? if (hw.mac.type < e1000_82543) ~~^ -> /usr/src/sys/dev/e1000/if_em.c:990:8: error: member reference type 'struct e1000_hw *' is a pointer; did you mean to use '->'? if (hw.mac.type < em_mac_min) { ~~^ -> /usr/src/sys/dev/e1000/if_em.c:1005:32: error: member reference type 'struct e1000_hw *' is a pointer; did you mean to use '->'? scctx->isc_max_frame_size = hw.mac.max_frame_size = ~~^ -> /usr/src/sys/dev/e1000/if_em.c:1796:18: error: member reference type 'struct e1000_hw *' is a pointer; did you mean to use '->'? link_check = hw.mac.serdes_has_link; ~~^ -> /usr/src/sys/dev/e1000/if_em.c:1844:9: error: member reference type 'struct e1000_hw *' is a pointer; did you mean to use '->'? hw.mac.type >= igb_mac_min) { ~~^ -> /usr/src/sys/dev/e1000/if_em.c:2091:8: error: member reference type 'struct e1000_hw *' is a pointer; did you mean to use '->'? if (hw.mac.type != e1000_82575) ~~^ -> /usr/src/sys/dev/e1000/if_em.c:2097:12: error: member reference type 'struct e1000_hw *' is a pointer; did you mean to use '->'? switch (hw.mac.type) { ~~^ -> /usr/src/sys/dev/e1000/if_em.c:2496:9: error: member reference type 'struct e1000_hw *' is a pointer; did you mean to use '->'? if (hw.mac.max_frame_size > 4096) ~~^ -> /usr/src/sys/dev/e1000/if_em.c:2528:9: error: member reference type 'struct e1000_hw *' is a pointer; did you mean to use '->'? if (hw.mac.max_frame_size > 8192) [105/1851] ~~^ -> /usr/src/sys/dev/e1000/if_em.c:2540:15: error: member reference type 'struct e1000_hw *' is a pointer; did you mean to use '->'? min_tx = (hw.mac.max_frame_size + ~~^ -> /usr/src/sys/dev/e1000/if_em.c:2544:14: error: member reference type 'struct e1000_hw *' is a pointer; did you mean to use '->'? min_rx = hw.mac.max_frame_size; ~~^ -> /usr/src/sys/dev/e1000/if_em.c:2581:17: error: member reference type 'struct e1000_hw *' is a pointer; did you mean to use '->'? roundup2(hw.mac.max_frame_size, 1024); ~~^ -> /usr/src/sys/sys/param.h:310:27: note: expanded from macro 'roundup2' #define roundup2(x, y) (((x)+((y)-1))&(~((y)-1))) /* if y is powers of two */ ^ /usr/src/sys/dev/e1000/if_em.c:2656:8: error: member reference type 'struct e1000_hw *' is a pointer; did you mean to use '->'? if (hw.mac.type >= igb_mac_min) { ~~^ -> /usr/src/sys/dev/e1000/if_em.c:2672:8: error: member reference type 'struct e1000_hw *' is a pointer; did you mean to use '->'? if (hw.mac.type >= igb_mac_min) ~~^ -> /usr/src/sys/dev/e1000/if_em.c:2737:8: error: member reference type 'struct e1000_hw *' is a pointer; did you mean to use '->'? if (hw.mac.type == e1000_82575) ~~^ -> fatal error: too many errors emitted, stopping now [-ferror-limit=] To good health, Alastair