Module Name: src
Committed By: riastradh
Date: Sat Feb 6 02:40:49 UTC 2016
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe_api.c ixgbe_common.c
Log Message:
Avoid shadowing global `min'.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/pci/ixgbe/ixgbe_api.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pci/ixgbe/ixgbe_common.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_api.c
diff -u src/sys/dev/pci/ixgbe/ixgbe_api.c:1.10 src/sys/dev/pci/ixgbe/ixgbe_api.c:1.11
--- src/sys/dev/pci/ixgbe/ixgbe_api.c:1.10 Sat Feb 6 02:39:18 2016
+++ src/sys/dev/pci/ixgbe/ixgbe_api.c Sat Feb 6 02:40:49 2016
@@ -31,7 +31,7 @@
******************************************************************************/
/*$FreeBSD: head/sys/dev/ixgbe/ixgbe_api.c 251964 2013-06-18 21:28:19Z jfv $*/
-/*$NetBSD: ixgbe_api.c,v 1.10 2016/02/06 02:39:18 riastradh Exp $*/
+/*$NetBSD: ixgbe_api.c,v 1.11 2016/02/06 02:40:49 riastradh Exp $*/
#include "ixgbe_api.h"
#include "ixgbe_common.h"
@@ -1006,7 +1006,7 @@ s32 ixgbe_fc_enable(struct ixgbe_hw *hw)
* ixgbe_set_fw_drv_ver - Try to send the driver version number FW
* @hw: pointer to hardware structure
* @maj: driver major number to be sent to firmware
- * @min: driver minor number to be sent to firmware
+ * @minr: driver minor number to be sent to firmware
* @build: driver build number to be sent to firmware
* @ver: driver version number to be sent to firmware
**/
Index: src/sys/dev/pci/ixgbe/ixgbe_common.c
diff -u src/sys/dev/pci/ixgbe/ixgbe_common.c:1.6 src/sys/dev/pci/ixgbe/ixgbe_common.c:1.7
--- src/sys/dev/pci/ixgbe/ixgbe_common.c:1.6 Wed Aug 5 04:08:44 2015
+++ src/sys/dev/pci/ixgbe/ixgbe_common.c Sat Feb 6 02:40:49 2016
@@ -31,7 +31,7 @@
******************************************************************************/
/*$FreeBSD: head/sys/dev/ixgbe/ixgbe_common.c 251964 2013-06-18 21:28:19Z jfv $*/
-/*$NetBSD: ixgbe_common.c,v 1.6 2015/08/05 04:08:44 msaitoh Exp $*/
+/*$NetBSD: ixgbe_common.c,v 1.7 2016/02/06 02:40:49 riastradh Exp $*/
#include "ixgbe_common.h"
#include "ixgbe_phy.h"
@@ -4407,7 +4407,7 @@ out:
* ixgbe_set_fw_drv_ver_generic - Sends driver version to firmware
* @hw: pointer to the HW structure
* @maj: driver version major number
- * @min: driver version minor number
+ * @minr: driver version minor number
* @build: driver version build number
* @sub: driver version sub build number
*
@@ -4416,7 +4416,7 @@ out:
* else returns IXGBE_ERR_SWFW_SYNC when encountering an error acquiring
* semaphore or IXGBE_ERR_HOST_INTERFACE_COMMAND when command fails.
**/
-s32 ixgbe_set_fw_drv_ver_generic(struct ixgbe_hw *hw, u8 maj, u8 min,
+s32 ixgbe_set_fw_drv_ver_generic(struct ixgbe_hw *hw, u8 maj, u8 minr,
u8 build, u8 sub)
{
struct ixgbe_hic_drv_info fw_cmd;
@@ -4436,7 +4436,7 @@ s32 ixgbe_set_fw_drv_ver_generic(struct
fw_cmd.hdr.cmd_or_resp.cmd_resv = FW_CEM_CMD_RESERVED;
fw_cmd.port_num = (u8)hw->bus.func;
fw_cmd.ver_maj = maj;
- fw_cmd.ver_min = min;
+ fw_cmd.ver_min = minr;
fw_cmd.ver_build = build;
fw_cmd.ver_sub = sub;
fw_cmd.hdr.checksum = 0;
