[src/trunk]: src/sys/dev/pci/ixgbe Avoid shadowing global `min'.

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/528f5cc7d4d6
branches:  trunk
changeset: 343474:528f5cc7d4d6
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sat Feb 06 02:40:49 2016 +0000

description:
Avoid shadowing global `min'.

diffstat:

 sys/dev/pci/ixgbe/ixgbe_api.c    |  4 ++--
 sys/dev/pci/ixgbe/ixgbe_common.c |  8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (60 lines):

diff -r a00b43c292dd -r 528f5cc7d4d6 sys/dev/pci/ixgbe/ixgbe_api.c
--- a/sys/dev/pci/ixgbe/ixgbe_api.c     Sat Feb 06 02:39:51 2016 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_api.c     Sat Feb 06 02:40:49 2016 +0000
@@ -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 @@
  * 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
  **/
diff -r a00b43c292dd -r 528f5cc7d4d6 sys/dev/pci/ixgbe/ixgbe_common.c
--- a/sys/dev/pci/ixgbe/ixgbe_common.c  Sat Feb 06 02:39:51 2016 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe_common.c  Sat Feb 06 02:40:49 2016 +0000
@@ -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 @@
  *  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 @@
  *  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 @@
        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;