Module Name: src
Committed By: msaitoh
Date: Thu Jan 19 06:56:33 UTC 2017
Modified Files:
src/sys/dev/pci/ixgbe: ix_txrx.c ixgbe_common.c ixgbe_phy.c
ixgbe_type.h ixgbe_x540.c ixgbe_x550.c
Log Message:
Reduce diff against FreeBSD. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/pci/ixgbe/ix_txrx.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/pci/ixgbe/ixgbe_common.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/pci/ixgbe/ixgbe_phy.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/pci/ixgbe/ixgbe_type.h
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pci/ixgbe/ixgbe_x540.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pci/ixgbe/ixgbe_x550.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/ix_txrx.c
diff -u src/sys/dev/pci/ixgbe/ix_txrx.c:1.15 src/sys/dev/pci/ixgbe/ix_txrx.c:1.16
--- src/sys/dev/pci/ixgbe/ix_txrx.c:1.15 Wed Jan 18 08:15:22 2017
+++ src/sys/dev/pci/ixgbe/ix_txrx.c Thu Jan 19 06:56:33 2017
@@ -59,7 +59,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
/*$FreeBSD: head/sys/dev/ixgbe/ix_txrx.c 301538 2016-06-07 04:51:50Z sephe $*/
-/*$NetBSD: ix_txrx.c,v 1.15 2017/01/18 08:15:22 msaitoh Exp $*/
+/*$NetBSD: ix_txrx.c,v 1.16 2017/01/19 06:56:33 msaitoh Exp $*/
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -516,6 +516,7 @@ ixgbe_xmit(struct tx_ring *txr, struct m
return 0;
}
+
/*********************************************************************
*
* Allocate memory for tx_buffer structures. The tx_buffer stores all
@@ -2396,4 +2397,3 @@ tx_fail:
fail:
return (error);
}
-
Index: src/sys/dev/pci/ixgbe/ixgbe_common.c
diff -u src/sys/dev/pci/ixgbe/ixgbe_common.c:1.11 src/sys/dev/pci/ixgbe/ixgbe_common.c:1.12
--- src/sys/dev/pci/ixgbe/ixgbe_common.c:1.11 Mon Dec 5 08:50:29 2016
+++ src/sys/dev/pci/ixgbe/ixgbe_common.c Thu Jan 19 06:56:33 2017
@@ -31,7 +31,7 @@
******************************************************************************/
/*$FreeBSD: head/sys/dev/ixgbe/ixgbe_common.c 299200 2016-05-06 22:54:56Z pfg $*/
-/*$NetBSD: ixgbe_common.c,v 1.11 2016/12/05 08:50:29 msaitoh Exp $*/
+/*$NetBSD: ixgbe_common.c,v 1.12 2017/01/19 06:56:33 msaitoh Exp $*/
#include "ixgbe_common.h"
#include "ixgbe_phy.h"
@@ -201,7 +201,7 @@ bool ixgbe_device_supports_autoneg_fc(st
}
if (!supported) {
- ERROR_REPORT2(IXGBE_ERROR_UNSUPPORTED,
+ ERROR_REPORT2(IXGBE_ERROR_UNSUPPORTED,
"Device %x does not support flow control autoneg",
hw->device_id);
}
Index: src/sys/dev/pci/ixgbe/ixgbe_phy.c
diff -u src/sys/dev/pci/ixgbe/ixgbe_phy.c:1.10 src/sys/dev/pci/ixgbe/ixgbe_phy.c:1.11
--- src/sys/dev/pci/ixgbe/ixgbe_phy.c:1.10 Mon Dec 5 08:50:29 2016
+++ src/sys/dev/pci/ixgbe/ixgbe_phy.c Thu Jan 19 06:56:33 2017
@@ -31,7 +31,7 @@
******************************************************************************/
/*$FreeBSD: head/sys/dev/ixgbe/ixgbe_phy.c 303032 2016-07-19 17:31:48Z sbruno $*/
-/*$NetBSD: ixgbe_phy.c,v 1.10 2016/12/05 08:50:29 msaitoh Exp $*/
+/*$NetBSD: ixgbe_phy.c,v 1.11 2017/01/19 06:56:33 msaitoh Exp $*/
#include "ixgbe_api.h"
#include "ixgbe_common.h"
@@ -1535,7 +1535,7 @@ s32 ixgbe_identify_sfp_module_generic(st
hw->phy.type = ixgbe_phy_sfp_intel;
break;
default:
- hw->phy.type = ixgbe_phy_sfp_unknown;
+ hw->phy.type = ixgbe_phy_sfp_unknown;
break;
}
}
Index: src/sys/dev/pci/ixgbe/ixgbe_type.h
diff -u src/sys/dev/pci/ixgbe/ixgbe_type.h:1.17 src/sys/dev/pci/ixgbe/ixgbe_type.h:1.18
--- src/sys/dev/pci/ixgbe/ixgbe_type.h:1.17 Mon Dec 5 08:50:29 2016
+++ src/sys/dev/pci/ixgbe/ixgbe_type.h Thu Jan 19 06:56:33 2017
@@ -31,7 +31,7 @@
******************************************************************************/
/*$FreeBSD: head/sys/dev/ixgbe/ixgbe_type.h 299200 2016-05-06 22:54:56Z pfg $*/
-/*$NetBSD: ixgbe_type.h,v 1.17 2016/12/05 08:50:29 msaitoh Exp $*/
+/*$NetBSD: ixgbe_type.h,v 1.18 2017/01/19 06:56:33 msaitoh Exp $*/
#ifndef _IXGBE_TYPE_H_
#define _IXGBE_TYPE_H_
@@ -121,10 +121,10 @@
#define IXGBE_SUBDEV_ID_82599_SFP_LOM 0x06EE
#define IXGBE_DEV_ID_82599_BACKPLANE_FCOE 0x152A
#define IXGBE_DEV_ID_82599_SFP_FCOE 0x1529
+#define IXGBE_DEV_ID_82599_SFP_EM 0x1507
#define IXGBE_DEV_ID_82599_SFP_SF2 0x154D
#define IXGBE_DEV_ID_82599_SFP_SF_QP 0x154A
#define IXGBE_DEV_ID_82599_QSFP_SF_QP 0x1558
-#define IXGBE_DEV_ID_82599_SFP_EM 0x1507
#define IXGBE_DEV_ID_82599EN_SFP 0x1557
#define IXGBE_SUBDEV_ID_82599EN_SFP_OCP1 0x0001
#define IXGBE_DEV_ID_82599_XAUI_LOM PCI_PRODUCT_INTEL_82599_XAUI_LOM
Index: src/sys/dev/pci/ixgbe/ixgbe_x540.c
diff -u src/sys/dev/pci/ixgbe/ixgbe_x540.c:1.8 src/sys/dev/pci/ixgbe/ixgbe_x540.c:1.9
--- src/sys/dev/pci/ixgbe/ixgbe_x540.c:1.8 Mon Dec 5 08:50:29 2016
+++ src/sys/dev/pci/ixgbe/ixgbe_x540.c Thu Jan 19 06:56:33 2017
@@ -82,7 +82,7 @@ s32 ixgbe_init_ops_X540(struct ixgbe_hw
/* PHY */
phy->ops.init = ixgbe_init_phy_ops_generic;
phy->ops.reset = NULL;
- phy->ops.set_phy_power = ixgbe_set_copper_phy_power;
+ phy->ops.set_phy_power = ixgbe_set_copper_phy_power;
/* MAC */
mac->ops.reset_hw = ixgbe_reset_hw_X540;
Index: src/sys/dev/pci/ixgbe/ixgbe_x550.c
diff -u src/sys/dev/pci/ixgbe/ixgbe_x550.c:1.4 src/sys/dev/pci/ixgbe/ixgbe_x550.c:1.5
--- src/sys/dev/pci/ixgbe/ixgbe_x550.c:1.4 Tue Dec 27 11:17:51 2016
+++ src/sys/dev/pci/ixgbe/ixgbe_x550.c Thu Jan 19 06:56:33 2017
@@ -965,7 +965,7 @@ void ixgbe_restore_mdd_vf_X550(struct ix
num_qs = 4; /* 32 VFs / pools */
bitmask = 0x0000000F;
break;
- default: /* 64 VFs / pools */
+ default: /* 64 VFs / pools */
num_qs = 2;
bitmask = 0x00000003;
break;
