git: c1655b0f8998 - main - e1000: consistently use the hw variables

[al]

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