Thu Aug 27 04:49:52 2020 UTC ()
 Fix compile error.


(msaitoh)
diff -r1.246 -r1.247 src/sys/dev/pci/ixgbe/ixgbe.c

cvs diff -r1.246 -r1.247 src/sys/dev/pci/ixgbe/ixgbe.c (expand / switch to unified diff)

--- src/sys/dev/pci/ixgbe/ixgbe.c 2020/08/27 03:57:52 1.246
+++ src/sys/dev/pci/ixgbe/ixgbe.c 2020/08/27 04:49:52 1.247
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: ixgbe.c,v 1.246 2020/08/27 03:57:52 msaitoh Exp $ */ 1/* $NetBSD: ixgbe.c,v 1.247 2020/08/27 04:49:52 msaitoh Exp $ */
2 2
3/****************************************************************************** 3/******************************************************************************
4 4
5 Copyright (c) 2001-2017, Intel Corporation 5 Copyright (c) 2001-2017, Intel Corporation
6 All rights reserved. 6 All rights reserved.
7 7
8 Redistribution and use in source and binary forms, with or without 8 Redistribution and use in source and binary forms, with or without
9 modification, are permitted provided that the following conditions are met: 9 modification, are permitted provided that the following conditions are met:
10 10
11 1. Redistributions of source code must retain the above copyright notice, 11 1. Redistributions of source code must retain the above copyright notice,
12 this list of conditions and the following disclaimer. 12 this list of conditions and the following disclaimer.
13 13
14 2. Redistributions in binary form must reproduce the above copyright 14 2. Redistributions in binary form must reproduce the above copyright
@@ -4490,27 +4490,27 @@ ixgbe_handle_timer(struct work *wk, void @@ -4490,27 +4490,27 @@ ixgbe_handle_timer(struct work *wk, void
4490 struct ixgbe_hw *hw = &adapter->hw; 4490 struct ixgbe_hw *hw = &adapter->hw;
4491 device_t dev = adapter->dev; 4491 device_t dev = adapter->dev;
4492 struct ix_queue *que = adapter->queues; 4492 struct ix_queue *que = adapter->queues;
4493 u64 queues = 0; 4493 u64 queues = 0;
4494 u64 v0, v1, v2, v3, v4, v5, v6, v7; 4494 u64 v0, v1, v2, v3, v4, v5, v6, v7;
4495 int hung = 0; 4495 int hung = 0;
4496 int i; 4496 int i;
4497 4497
4498 IXGBE_CORE_LOCK(adapter); 4498 IXGBE_CORE_LOCK(adapter);
4499 4499
4500 /* Check for pluggable optics */ 4500 /* Check for pluggable optics */
4501 if (ixgbe_is_sfp(hw)) { 4501 if (ixgbe_is_sfp(hw)) {
4502 bool was_full = hw->phy.sfp_type != ixgbe_sfp_type_not_present; 4502 bool was_full = hw->phy.sfp_type != ixgbe_sfp_type_not_present;
4503 bool is_full = ixgbe_sfp_cage_full(hw); 4503 bool is_full = ixgbe_sfp_cage_full(adapter);
4504 4504
4505 /* do probe if cage state changed */ 4505 /* do probe if cage state changed */
4506 if (was_full ^ is_full) { 4506 if (was_full ^ is_full) {
4507 atomic_or_32(&adapter->task_requests, 4507 atomic_or_32(&adapter->task_requests,
4508 IXGBE_REQUEST_TASK_MOD); 4508 IXGBE_REQUEST_TASK_MOD);
4509 ixgbe_schedule_admin_tasklet(adapter); 4509 ixgbe_schedule_admin_tasklet(adapter);
4510 } 4510 }
4511 } 4511 }
4512 4512
4513 ixgbe_update_link_status(adapter); 4513 ixgbe_update_link_status(adapter);
4514 ixgbe_update_stats_counters(adapter); 4514 ixgbe_update_stats_counters(adapter);
4515 4515
4516 /* Update some event counters */ 4516 /* Update some event counters */