Module Name: src
Committed By: msaitoh
Date: Thu Jun 18 09:00:11 UTC 2020
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c ixv.c
Log Message:
Modify a liitle to reduce diff between ixgbe.c and ixv.c. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.231 -r1.232 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.149 -r1.150 src/sys/dev/pci/ixgbe/ixv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.231 src/sys/dev/pci/ixgbe/ixgbe.c:1.232
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.231 Wed Jun 17 09:11:13 2020
+++ src/sys/dev/pci/ixgbe/ixgbe.c Thu Jun 18 09:00:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.231 2020/06/17 09:11:13 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.232 2020/06/18 09:00:11 msaitoh Exp $ */
/******************************************************************************
@@ -168,9 +168,9 @@ static bool ixgbe_suspend(device_t, cons
static bool ixgbe_resume(device_t, const pmf_qual_t *);
static int ixgbe_ifflags_cb(struct ethercom *);
static int ixgbe_ioctl(struct ifnet *, u_long, void *);
-static void ixgbe_ifstop(struct ifnet *, int);
static int ixgbe_init(struct ifnet *);
static void ixgbe_init_locked(struct adapter *);
+static void ixgbe_ifstop(struct ifnet *, int);
static void ixgbe_stop(void *);
static void ixgbe_init_device_features(struct adapter *);
static void ixgbe_check_fan_failure(struct adapter *, u32, bool);
@@ -4457,7 +4457,7 @@ ixgbe_local_timer1(void *arg)
{
struct adapter *adapter = arg;
device_t dev = adapter->dev;
- struct ix_queue *que = adapter->queues;
+ struct ix_queue *que = adapter->queues;
u64 queues = 0;
u64 v0, v1, v2, v3, v4, v5, v6, v7;
int hung = 0;
@@ -4530,7 +4530,7 @@ ixgbe_local_timer1(void *arg)
}
}
- /* Only truely watchdog if all queues show hung */
+ /* Only truly watchdog if all queues show hung */
if (hung == adapter->num_queues)
goto watchdog;
#if 0 /* XXX Avoid unexpectedly disabling interrupt forever (PR#53294) */
@@ -6258,7 +6258,7 @@ out:
* return 0 on success, positive on failure
************************************************************************/
static int
-ixgbe_ioctl(struct ifnet * ifp, u_long command, void *data)
+ixgbe_ioctl(struct ifnet *ifp, u_long command, void *data)
{
struct adapter *adapter = ifp->if_softc;
struct ixgbe_hw *hw = &adapter->hw;
Index: src/sys/dev/pci/ixgbe/ixv.c
diff -u src/sys/dev/pci/ixgbe/ixv.c:1.149 src/sys/dev/pci/ixgbe/ixv.c:1.150
--- src/sys/dev/pci/ixgbe/ixv.c:1.149 Thu Jun 11 09:16:05 2020
+++ src/sys/dev/pci/ixgbe/ixv.c Thu Jun 18 09:00:11 2020
@@ -1,4 +1,4 @@
-/*$NetBSD: ixv.c,v 1.149 2020/06/11 09:16:05 msaitoh Exp $*/
+/*$NetBSD: ixv.c,v 1.150 2020/06/18 09:00:11 msaitoh Exp $*/
/******************************************************************************
@@ -158,7 +158,7 @@ const struct sysctlnode *ixv_sysctl_inst
static const ixgbe_vendor_info_t *ixv_lookup(const struct pci_attach_args *);
/************************************************************************
- * FreeBSD Device Interface Entry Points
+ * NetBSD Device Interface Entry Points
************************************************************************/
CFATTACH_DECL3_NEW(ixv, sizeof(struct adapter),
ixv_probe, ixv_attach, ixv_detach, NULL, NULL, NULL,
@@ -319,8 +319,8 @@ ixv_attach(device_t parent, device_t dev
/* Allocate, clear, and link in our adapter structure */
adapter = device_private(dev);
- adapter->dev = dev;
adapter->hw.back = adapter;
+ adapter->dev = dev;
hw = &adapter->hw;
adapter->init_locked = ixv_init_locked;
@@ -341,7 +341,7 @@ ixv_attach(device_t parent, device_t dev
aprint_normal(": %s, Version - %s\n",
ixv_strings[ent->index], ixv_driver_version);
- /* Core Lock Init*/
+ /* Core Lock Init */
IXGBE_CORE_LOCK_INIT(adapter, device_xname(dev));
/* Do base PCI setup - map BAR0 */
@@ -1081,7 +1081,7 @@ ixv_negotiate_api(struct adapter *adapte
/************************************************************************
- * ixv_set_multi - Multicast Update
+ * ixv_set_rxfilter - Multicast Update
*
* Called whenever multicast address list is updated.
************************************************************************/
@@ -3306,8 +3306,8 @@ ixv_allocate_msix(struct adapter *adapte
/* Round-robin affinity */
kcpuset_zero(affinity);
kcpuset_set(affinity, cpu_id % ncpu);
- error = interrupt_distribute(adapter->osdep.ihs[vector],
- affinity, NULL);
+ error = interrupt_distribute(adapter->osdep.ihs[vector], affinity,
+ NULL);
aprint_normal_dev(dev,
"for link, interrupting at %s", intrstr);
